diff --git a/modoboa/admin/postfix_maps.py b/modoboa/admin/postfix_maps.py
index 14aca3026..a1df168fb 100644
--- a/modoboa/admin/postfix_maps.py
+++ b/modoboa/admin/postfix_maps.py
@@ -116,10 +116,10 @@ class SenderLoginMap(object):
         "WHERE sad.address='%s') "
         "UNION "
         "(SELECT concat(mb.address, '@', dom.name) FROM admin_mailbox mb "
-        "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
-        " INNER JOIN admin_domain dom ON dom.id=mb.domain_id"
-        " INNER JOIN admin_domainalias adom ON adom.target_id=dom.id"
-        " INNER JOIN admin_alias al ON alr.alias_id=al.id "
+        "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
+        "INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
+        "INNER JOIN admin_alias al ON alr.alias_id=al.id "
+        "LEFT JOIN admin_domainalias adom ON adom.target_id=dom.id "
         "WHERE al.enabled=1 AND ("
         "  al.address='%s' OR ("
         "    adom.name='@d' AND al.address='%u'||'@'||dom.name"
@@ -134,10 +134,10 @@ class SenderLoginMap(object):
         "WHERE sad.address='%s') "
         "UNION "
         "(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
-        "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id"
-        " INNER JOIN admin_domain dom ON dom.id=mb.domain_id"
-        " INNER JOIN admin_domainalias adom ON adom.target_id=dom.id"
-        " INNER JOIN admin_alias al ON alr.alias_id=al.id "
+        "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
+        "INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
+        "INNER JOIN admin_alias al ON alr.alias_id=al.id "
+        "LEFT JOIN admin_domainalias adom ON adom.target_id=dom.id "
         "WHERE al.enabled AND ("
         "  al.address='%s' OR ("
         "    adom.name='@d' AND al.address='%u'||'@'||dom.name"
@@ -154,8 +154,8 @@ class SenderLoginMap(object):
         "SELECT mb.address || '@' || dom.name FROM admin_mailbox mb "
         "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id "
         "INNER JOIN admin_domain dom ON dom.id=mb.domain_id "
-        "INNER JOIN admin_domainalias adom ON adom.target_id=dom.id "
         "INNER JOIN admin_alias al ON alr.alias_id=al.id "
+        "LEFT JOIN admin_domainalias adom ON adom.target_id=dom.id "
         "WHERE al.enabled=1 AND ("
         "  al.address='%s' OR ("
         "    adom.name='@d' AND al.address='%u'||'@'||dom.name"