diff --git a/lib/mail.sh b/lib/mail.sh
index 0f5000c..d711170 100644
--- a/lib/mail.sh
+++ b/lib/mail.sh
@@ -85,13 +85,13 @@ LDAP_SERVER_HOST=ldap://ldap.$DOMAIN
 LDAP_SEARCH_BASE=ou=people,dc=federatedcomputer,dc=cloud
 LDAP_BIND_DN=cn=admin,dc=federatedcomputer,dc=cloud
 LDAP_BIND_PW=$LDAP_SECRET
-LDAP_QUERY_FILTER_USER=(&(mail=%s)(mailEnabled=TRUE))
-LDAP_QUERY_FILTER_GROUP=(&(mailGroupMember=%s)(mailEnabled=TRUE))
-LDAP_QUERY_FILTER_ALIAS=(&(mailAlias=%s)(mailEnabled=TRUE))
-LDAP_QUERY_FILTER_DOMAIN=(|(mail=*@%s)(mailAlias=*@%s))
+LDAP_QUERY_FILTER_USER="(&(mail=%s)(mailEnabled=TRUE))"
+LDAP_QUERY_FILTER_GROUP="(&(mailGroupMember=%s)(mailEnabled=TRUE))"
+LDAP_QUERY_FILTER_ALIAS="(&(mailAlias=%s)(mailEnabled=TRUE))"
+LDAP_QUERY_FILTER_DOMAIN="(|(mail=*@%s)(mailAlias=*@%s))"
 # DOVECOT
-DOVECOT_PASS_FILTER=(&(objectClass=inetOrgPerson)(mail=%u))
-DOVECOT_USER_FILTER=(&(objectClass=inetOrgPerson)(mail=%u))
+DOVECOT_PASS_FILTER="(&(objectClass=inetOrgPerson)(mail=%u))"
+DOVECOT_USER_FILTER="(&(objectClass=inetOrgPerson)(mail=%u))"
 DOVECOT_USER_ATTRS=homeDirectory=home,=uid=5000,=gid=5000
 # SASLAUTHD
 ENABLE_SASLAUTHD=1
@@ -100,7 +100,7 @@ SASLAUTHD_LDAP_SERVER=ldap://ldap.$DOMAIN
 SASLAUTHD_LDAP_BIND_DN=cn=admin,dc=federatedcomputer,dc=cloud
 SASLAUTHD_LDAP_PASSWORD=$LDAP_SECRET
 SASLAUTHD_LDAP_SEARCH_BASE=ou=people,dc=federatedcomputer,dc=cloud
-SASLAUTHD_LDAP_FILTER=(&(objectClass=inetOrgPerson)(mail=%U@%r))
+SASLAUTHD_LDAP_FILTER="(&(objectClass=inetOrgPerson)(mail=%U@%r))"
 POSTMASTER_ADDRESS=postmaster@localhost.localdomain
 POSTFIX_MESSAGE_SIZE_LIMIT=100000000
 ENABLE_MANAGESIEVE=1