diff --git a/dovecot.nix b/dovecot.nix
index a56476b..65dd0f4 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -245,7 +245,7 @@ in {
 
         mailUser = cfg.mail-user;
         mailGroup = cfg.mail-group;
-        mailLocation = "maildir:${cfg.state-directory}/mail//%u/";
+        mailLocation = "maildir:${cfg.state-directory}/mail/%u/";
         createMailUser = false;
 
         sslServerCert = cfg.ssl.certificate;
diff --git a/mail-server.nix b/mail-server.nix
index 1009827..ca503f6 100644
--- a/mail-server.nix
+++ b/mail-server.nix
@@ -212,31 +212,6 @@ in {
       };
     };
 
-    users = {
-      users = {
-        mailserver-dovecot = {
-          uid = 4455;
-          isSystemUser = true;
-          group = "mailserver-dovecot";
-        };
-        mailserver-antivirus = {
-          uid = 4456;
-          isSystemUser = true;
-          group = "mailserver-antivirus";
-        };
-        mailserver-dkim = {
-          uid = 4457;
-          isSystemUser = true;
-          group = "mailserver-dkim";
-        };
-      };
-      groups = {
-        mailserver-dovecot = { };
-        mailserver-antivirus = { };
-        mailserver-dkim = { };
-      };
-    };
-
     systemd.tmpfiles.rules = [
       "d ${cfg.state-directory}/dovecot   0700 mailserver-dovecot   - - -"
       "d ${cfg.state-directory}/antivirus 0700 mailserver-antivirus - - -"
diff --git a/postfix.nix b/postfix.nix
index 054facb..25e8878 100644
--- a/postfix.nix
+++ b/postfix.nix
@@ -188,8 +188,10 @@ in {
       dovecot2 = {
         enable = true;
         enablePAM = false;
-        enableImap = true;
-        extraConfig = ''
+        extraConfig = let
+          mailUser = config.services.dovecot2.user;
+          mailUserUid = config.users.users."${mailUser}".uid;
+        in ''
           # Extra Config
           ${lib.optionalString cfg.debug "auth_debug = yes"}
 
@@ -204,8 +206,8 @@ in {
           }
 
           userdb = {
-            driver = ldap
-            args = ${cfg.ldap-conf}
+            driver = static
+            args = uid=${toString mailUserUid} home=/tmp/%u
           }
 
           service auth {