diff --git a/Python/etc/postfix/ldap-canonical.cf b/Python/etc/postfix/ldap-canonical.cf
index 050840b..ef3f48a 100644
--- a/Python/etc/postfix/ldap-canonical.cf
+++ b/Python/etc/postfix/ldap-canonical.cf
@@ -2,6 +2,6 @@
 
 header()
 
-query="(&(mail=%s)(canonicalAlias=*))"
-result="canonicalAlias"
+query="(&(|(canonicalAlias=%s)(mail=%s))(uid=*))"
+result="mail"
 dump("template/postfix/ldap")