diff --git a/bundles/mailserver/items.py b/bundles/mailserver/items.py
index 04b4e0c..23edb9e 100644
--- a/bundles/mailserver/items.py
+++ b/bundles/mailserver/items.py
@@ -32,6 +32,9 @@ setup = f"""
     ALTER TABLE users
     	ADD CONSTRAINT no_password_for_redirects
         CHECK (redirect IS null OR password IS null);
+    ALTER TABLE users
+    	ADD CONSTRAINT name_is_not_empty_string
+        CHECK (name <> '');
 
     -- OWNERSHIPS
     
diff --git a/bundles/postfix/files/virtual_alias_maps.cf b/bundles/postfix/files/virtual_alias_maps.cf
index fe427cd..853bd51 100644
--- a/bundles/postfix/files/virtual_alias_maps.cf
+++ b/bundles/postfix/files/virtual_alias_maps.cf
@@ -2,4 +2,4 @@ hosts = ${host}
 dbname = ${name}
 user = ${user}
 password = ${password}
-query = SELECT redirect FROM users LEFT JOIN domains ON users.domain_id = domains.id WHERE redirect IS NOT NULL AND users.name = '%u' AND domains.name = '%d'
+query = SELECT redirect FROM users LEFT JOIN domains ON users.domain_id = domains.id WHERE redirect IS NOT NULL AND domains.name = '%d' AND (users.name = '%u' OR users.name IS null)