diff --git a/modules/services/mail/dovecot2.nix b/modules/services/mail/dovecot2.nix
index 984c348dad8c..71e246392f9d 100644
--- a/modules/services/mail/dovecot2.nix
+++ b/modules/services/mail/dovecot2.nix
@@ -36,13 +36,15 @@ let
         user = root
       }
       userdb {
-        driver=passwd
+        driver = passwd
       }
       passdb {
-        driver=pam
+        driver = pam
+        args = dovecot2
       }
-      auth_debug = yes
-      auth_verbose = yes
+      #auth_debug = yes
+      #auth_verbose = yes
+      #debug_log_path = /tmp/dovecot2debug.log
 
       pop3_uidl_format = %08Xv%08Xu
 
@@ -134,6 +136,8 @@ in
         exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";
       };
 
+    environment.systemPackages = [ pkgs.dovecot_2_0 ];
+
   };
 
 }