diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/12usernameFormat smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/12usernameFormat
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/12usernameFormat	1969-12-31 19:00:00.000000000 -0500
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/12usernameFormat	2020-05-02 17:36:56.774000000 -0400
@@ -0,0 +1,6 @@
+{
+$OUT = "#only accept username as default, not " unless ($dovecot{AcceptFullEmail} || "enabled" ) eq "enabled";
+
+$OUT = "auth_username_format = \%n";
+
+}