diff --git a/default.nix b/default.nix
index ec88f7e..60dbceb 100644
--- a/default.nix
+++ b/default.nix
@@ -290,8 +290,8 @@ in
 
         userFilter = mkOption {
           type = types.str;
-          default = "mail=%u";
-          example = "(&(objectClass=inetOrgPerson)(mail=%u))";
+          default = "mail=%{user}";
+          example = "(&(objectClass=inetOrgPerson)(mail=%{user}))";
           description = ''
             Filter for user lookups in Dovecot.
 
@@ -315,8 +315,8 @@ in
 
         passFilter = mkOption {
           type = types.nullOr types.str;
-          default = "mail=%u";
-          example = "(&(objectClass=inetOrgPerson)(mail=%u))";
+          default = "mail=%{user}";
+          example = "(&(objectClass=inetOrgPerson)(mail=%{user}))";
           description = ''
             Filter for password lookups in Dovecot.
 
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index e0efaff..0abfec4 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -33,9 +33,9 @@ let
 
   # maildir in format "/${domain}/${user}"
   dovecotMaildir =
-    "maildir:${cfg.mailDirectory}/%d/%n${maildirLayoutAppendix}${maildirUTF8FolderNames}"
+    "maildir:${cfg.mailDirectory}/%{domain}/%{username}${maildirLayoutAppendix}${maildirUTF8FolderNames}"
     + (lib.optionalString (cfg.indexDir != null)
-       ":INDEX=${cfg.indexDir}/%d/%n"
+       ":INDEX=${cfg.indexDir}/%{domain}/%{username}"
       );
 
   postfixCfg = config.services.postfix;
@@ -177,8 +177,8 @@ in
       protocols = lib.optional cfg.enableManageSieve "sieve";
 
       pluginSettings = {
-        sieve = "file:${cfg.sieveDirectory}/%u/scripts;active=${cfg.sieveDirectory}/%u/active.sieve";
-        sieve_default = "file:${cfg.sieveDirectory}/%u/default.sieve";
+        sieve = "file:${cfg.sieveDirectory}/%{user}/scripts;active=${cfg.sieveDirectory}/%{user}/active.sieve";
+        sieve_default = "file:${cfg.sieveDirectory}/%{user}/default.sieve";
         sieve_default_name = "default";
       };
 
@@ -329,7 +329,7 @@ in
         userdb {
           driver = ldap
           args = ${ldapConfFile}
-          default_fields = home=/var/vmail/ldap/%u uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID}
+          default_fields = home=/var/vmail/ldap/%{user} uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID}
         }
         ''}