diff --git a/templates/mailserver/dovecot-sql.conf.erb b/templates/mailserver/dovecot-sql.conf.erb
index d94626f..41e1cbd 100644
--- a/templates/mailserver/dovecot-sql.conf.erb
+++ b/templates/mailserver/dovecot-sql.conf.erb
@@ -2,4 +2,4 @@ driver = mysql
 connect = host=<%= @db_hosts %> dbname=<%= @db_name %> user=<%= @db_user %> password=<%= @db_pass %>
 default_pass_scheme = CRYPT
 user_query = SELECT CONCAT('maildir:<%= @mailbox_base %>/', maildir) AS mail, '2000' AS uid, '2000' AS gid, CONCAT('maildir:storage=', floor(quota*1024)) AS quota FROM user WHERE email = (SELECT IF((SELECT email from user where email = '%u') is not null, '%u', CONCAT('@','%d')))
-password_query = SELECT email AS user, NULL as password, 'Y' as nopassword FROM user WHERE email = '%u' AND (ENCRYPT('%w', LEFT(password, 2)) = password OR MD5('%w') = password)
\ No newline at end of file
+password_query = SELECT email AS user, NULL as password, 'Y' as nopassword FROM user WHERE email = '%u' AND (ENCRYPT('%w', LEFT(password, 2)) = password OR MD5('%w') = password) AND status = 'active'
\ No newline at end of file
diff --git a/templates/mailserver/mysql_virtual_mailbox_maps.cf.erb b/templates/mailserver/mysql_virtual_mailbox_maps.cf.erb
index 33163ae..e3d9e88 100644
--- a/templates/mailserver/mysql_virtual_mailbox_maps.cf.erb
+++ b/templates/mailserver/mysql_virtual_mailbox_maps.cf.erb
@@ -2,4 +2,4 @@ hosts = <%= @db_hosts %>
 dbname = <%= @db_name %>
 user = <%= @db_user %>
 password = <%= @db_pass %>
-query = SELECT maildir FROM user WHERE email = '%s'
\ No newline at end of file
+query = SELECT maildir FROM user WHERE email = '%s' AND status = 'active'
\ No newline at end of file