diff --git a/roles/mail/templates/dovecot-backend/conf.d/10-master.conf b/roles/mail/templates/dovecot-backend/conf.d/10-master.conf
index 69bacbe8a0ff0389b9418ad84304724ceffd049c..8e1bc852727fb82e7456dd6acf2df9a78463a53f 100644
--- a/roles/mail/templates/dovecot-backend/conf.d/10-master.conf
+++ b/roles/mail/templates/dovecot-backend/conf.d/10-master.conf
@@ -24,7 +24,7 @@ service imap-login {
   }
 
   service_count = 0
-  client_limit = 65536
+  client_limit = 65535
   process_limit = 8
   process_min_avail = 8
   vsz_limit = 1G
@@ -40,7 +40,7 @@ service pop3-login {
   }
 
   service_count = 0
-  client_limit = 65536
+  client_limit = 65535
   process_limit = 8
   process_min_avail = 8
   vsz_limit = 1G
@@ -56,7 +56,7 @@ service managesieve-login {
   #}
 
   service_count = 0
-  client_limit = 65536
+  client_limit = 65535
   process_limit = 4
   process_min_avail = 2
   vsz_limit = 1G
@@ -108,6 +108,8 @@ service managesieve {
 }
 
 service auth {
+  client_limit = 25720
+
   # auth_socket_path points to this userdb socket by default. It's typically
   # used by dovecot-lda, doveadm, possibly imap process, etc. Users that have
   # full permissions to this socket are able to get a list of all usernames and
diff --git a/roles/mail/templates/dovecot-frontend/conf.d/10-master.conf b/roles/mail/templates/dovecot-frontend/conf.d/10-master.conf
index 3ab3cfdfb8413067f9da91454464d2f071b1e0e7..2c81f214e8827a289c82c7947708d8d1e0d78de7 100644
--- a/roles/mail/templates/dovecot-frontend/conf.d/10-master.conf
+++ b/roles/mail/templates/dovecot-frontend/conf.d/10-master.conf
@@ -26,7 +26,7 @@ service imap-login {
   service_count = 0
   process_limit = 8
   process_min_avail = 8
-  client_limit = 65536
+  client_limit = 65535
   vsz_limit = 4096M
 }
 
@@ -42,7 +42,7 @@ service pop3-login {
   service_count = 0
   process_limit = 8
   process_min_avail = 8
-  client_limit = 65536
+  client_limit = 65535
   vsz_limit = 4096M
 }