diff --git a/dovecot.nix b/dovecot.nix
index 027e51d..92d6ac2 100644
--- a/dovecot.nix
+++ b/dovecot.nix
@@ -356,6 +356,7 @@ in {
 
           passdb {
             driver = ldap
+            user_format = %n
             args = ${cfg.ldap-conf}
           }
 
diff --git a/mail-server.nix b/mail-server.nix
index 0f7e7bc..a2b3d18 100644
--- a/mail-server.nix
+++ b/mail-server.nix
@@ -209,8 +209,8 @@ in {
             "auth_bind = yes"
             "auth_bind_userdn = cn=%n,${cfg.ldap.member-ou},${cfg.ldap.base}"
             "base = ${cfg.ldap.base}"
-            "user_filter = (&(objectClass=organizationalPerson))"
-            "pass_filter = (&(objectClass=organizationalPerson))"
+            "user_filter = (&(objectClass=organizationalPerson)(cn=%n))"
+            "pass_filter = (&(objectClass=organizationalPerson)(cn=%n))"
             "pass_attrs = =user=%{ldap:cn}"
             "user_attrs = =user=%{ldap:cn}"
           ]);