1 files changed, 5 insertions, 1 deletions

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index fb8573ce..e2f71c21 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -287,8 +287,9 @@ in {
         dovecotSqlConf = pkgs.writeText "dovecot-sql.conf" ''
           driver = pgsql
           connect = dbname=email
-          password_query = SELECT user, quota_rule FROM imap_user WHERE user = '%u'
+          password_query = SELECT NULL as password, user as user, quota_rule FROM imap_user WHERE user = '%u'
           user_query = SELECT user, quota_rule FROM imap_user WHERE user = '%u'
+          iterate_query = SELECT user FROM imap_user
         '';
       in ''
         mail_home = /var/lib/mail/%u
@@ -326,6 +327,9 @@ in {
         }
 
         userdb {
+          driver = prefetch
+        }
+        userdb {
           driver = sql
           args = ${dovecotSqlConf}
           default_fields = uid=dovecot2 gid=dovecot2 nopassword