1 files changed, 2 insertions, 4 deletions

diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index e2f71c21..f30d9aaf 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -287,8 +287,8 @@ in {
         dovecotSqlConf = pkgs.writeText "dovecot-sql.conf" ''
           driver = pgsql
           connect = dbname=email
-          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'
+          password_query = SELECT NULL as password, 'Y' as nopassword, user, quota_rule, 'dovecot2' as uid, 'dovecot2' as gid FROM imap_user WHERE user = '%u'
+          user_query = SELECT user, quota_rule, 'dovecot2' as uid, 'dovecot2' as gid FROM imap_user WHERE user = '%u'
           iterate_query = SELECT user FROM imap_user
         '';
       in ''
@@ -332,12 +332,10 @@ in {
         userdb {
           driver = sql
           args = ${dovecotSqlConf}
-          default_fields = uid=dovecot2 gid=dovecot2 nopassword
         }
         passdb {
           driver = sql
           args = ${dovecotSqlConf}
-          default_fields = uid=dovecot2 gid=dovecot2 nopassword
         }
 
         mail_plugins = $mail_plugins quota