diff --git a/templates/dovecot/dovecot-sql.conf.j2 b/templates/dovecot/dovecot-sql.conf.j2
index 11a06bb..323c7e6 100644
--- a/templates/dovecot/dovecot-sql.conf.j2
+++ b/templates/dovecot/dovecot-sql.conf.j2
@@ -1,5 +1,5 @@
 driver = pgsql
 connect = dbname=postfixadmin
 
-password_query = SELECT username AS user,password FROM mailbox WHERE username = '%u' AND active='1'
-user_query = SELECT '/var/mail/vmail/' || maildir AS home, '*:bytes=' || quota AS quota_rule FROM mailbox WHERE username = '%u' AND active = '1'
+password_query = SELECT username AS user, password, CASE WHEN active THEN NULL ELSE 'y' END AS nologin FROM mailbox WHERE username = '%u'
+user_query = SELECT '/var/mail/vmail/' || maildir AS home, '*:bytes=' || quota AS quota_rule FROM mailbox WHERE username = '%u'