diff --git a/dovecot.nix b/dovecot.nix
index bf9b787..027e51d 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -357,7 +357,6 @@ in {
           passdb {
             driver = ldap
             args = ${cfg.ldap-conf}
-            pass_attrs = cn=user
           }
 
           # All users map to one actual system user
diff --git a/mail-server.nix b/mail-server.nix
index 2b0d637..a2b3d18 100644
--- a/mail-server.nix
+++ b/mail-server.nix
@@ -211,6 +211,8 @@ in {
             "base = ${cfg.ldap.base}"
             "user_filter = (&(objectClass=organizationalPerson)(cn=%n))"
             "pass_filter = (&(objectClass=organizationalPerson)(cn=%n))"
+            "pass_attrs = =user=%{ldap:cn}"
+            "user_attrs = =user=%{ldap:cn}"
           ]);
         target-file = "/run/dovecot-secret/ldap.conf";
       };
diff --git a/rspamd.nix b/rspamd.nix
index 262ba07..4b93250 100644
--- a/rspamd.nix
+++ b/rspamd.nix
@@ -155,6 +155,7 @@ in {
             }
           '';
 
+          # SURBL checks URLs in emails against known-bad urls
           "rbl.conf".text = ''
             surbl {
               rules {
@@ -172,7 +173,7 @@ in {
                     PH_SURBL_MULTI = 8;
                     SURBL_BLOCKED = 1;
                   }
-                          }
+                }
 
                 "URIBL_MULTI" {
                   ignore_defaults = true; # for compatibility with old defaults