diff --git a/scripts/40-postfix.sh b/scripts/40-postfix.sh
index 8f530bc..d4fc277 100644
--- a/scripts/40-postfix.sh
+++ b/scripts/40-postfix.sh
@@ -82,15 +82,7 @@ hosts = 127.0.0.1
 user = ${DB_USER}
 password = ${DB_PASS}
 dbname = ${DB_NAME}
-query = SELECT 1
-        FROM mail_users u
-        JOIN domains d ON d.id = u.domain_id
-        WHERE u.email = '%s'
-          AND u.is_active = 1
-          AND u.can_login = 1
-          AND u.password_hash IS NOT NULL
-          AND d.is_active = 1
-        LIMIT 1;
+query = SELECT 1 FROM mail_users u JOIN domains d ON d.id = u.domain_id WHERE u.email = '%s' AND u.is_active = 1 AND u.can_login = 1 AND u.password_hash IS NOT NULL AND d.is_active = 1 LIMIT 1;
 CONF
 chown root:postfix /etc/postfix/sql/mysql-virtual-mailbox-maps.cf
 chmod 640 /etc/postfix/sql/mysql-virtual-mailbox-maps.cf
@@ -101,18 +93,7 @@ hosts = 127.0.0.1
 user = ${DB_USER}
 password = ${DB_PASS}
 dbname = ${DB_NAME}
-
-query = SELECT COALESCE(mu.email, r.email) AS destination
-    FROM mail_aliases a
-    JOIN domains d ON d.id = a.domain_id
-    JOIN mail_alias_recipients r ON r.alias_id = a.id
-    LEFT JOIN mail_users mu ON mu.id = r.mail_user_id
-   WHERE d.domain = SUBSTRING_INDEX('%s','@',-1)
-     AND a.local  = SUBSTRING_INDEX('%s','@', 1)
-     AND a.is_active = 1
-     AND d.is_active = 1
-     AND (mu.email IS NOT NULL OR r.email IS NOT NULL)
-ORDER BY r.position ASC;
+query = SELECT COALESCE(mu.email, r.email) AS destination FROM mail_aliases a JOIN domains d ON d.id = a.domain_id JOIN mail_alias_recipients r ON r.alias_id = a.id LEFT JOIN mail_users mu ON mu.id = r.mail_user_id WHERE d.domain = SUBSTRING_INDEX('%s','@',-1) AND a.local  = SUBSTRING_INDEX('%s','@', 1) AND a.is_active = 1 AND d.is_active = 1 AND (mu.email IS NOT NULL OR r.email IS NOT NULL) ORDER BY r.position ASC;
 CONF
 chown root:postfix /etc/postfix/sql/mysql-virtual-alias-maps.cf
 chmod 640 /etc/postfix/sql/mysql-virtual-alias-maps.cf