diff --git a/templates/Fedora/35/etc/dovecot/local.conf b/templates/Fedora/35/etc/dovecot/local.conf
index 3b732cf..7e88d62 100644
--- a/templates/Fedora/35/etc/dovecot/local.conf
+++ b/templates/Fedora/35/etc/dovecot/local.conf
@@ -8,11 +8,11 @@ mail_privileged_group = mail
 first_valid_uid = 0
 mail_uid = mail
 mail_gid = mail
-mail_home = /var/spool/mail/%d/%u
+mail_home = /var/spool/mail/%d/%n
 
 passdb {
   driver = passwd-file
-  args = username_format=%n scheme=SHA512-CRYPT /etc/dovecot/accounts
+  args = username_format=%u scheme=SHA512-CRYPT /etc/dovecot/accounts
 }
 userdb {
   driver = static