diff --git a/templates/auth-dovecot-users.conf.ext.j2 b/templates/auth-dovecot-users.conf.ext.j2
index 6bd69cc..cc72d53 100644
--- a/templates/auth-dovecot-users.conf.ext.j2
+++ b/templates/auth-dovecot-users.conf.ext.j2
@@ -3,10 +3,10 @@
 
 passdb {
   driver = passwd-file
-  args = scheme=SHA512-CRYPT username_format=%u /etc/dovecot/users
+  args = scheme=SHA512-CRYPT username_format=%n /etc/dovecot/users
 }
 
 userdb {
   driver = static
-  args = uid=vmail gid=vmail home=/var/vmail/%u
+  args = uid=vmail gid=vmail home=/var/vmail/%n
 }