diff --git a/bundles/monit/files/mailserver.conf b/bundles/monit/files/mailserver.conf
index b214fbf..66dbd2f 100644
--- a/bundles/monit/files/mailserver.conf
+++ b/bundles/monit/files/mailserver.conf
@@ -1,7 +1,11 @@
 set alert ${recipient}
 set mailserver ${server} port ${port}
+% if username and password:
 	username "${username}"
 	password "${password}"
+% else:
+	without authentication
+% endif
 % if port == 587:
 	using tlsv1
 % endif