diff --git a/defaults/main.yml b/defaults/main.yml
index 8efcc04..6e2bf6c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -18,6 +18,11 @@ postfix:
   ldap:
     enable: false
     server_host: ldap.example.com
-    search_base: "dc=example,dc=com"
+    senders:
+      search_base: "ou=users,dc=example,dc=com"
+      query_filter: ""
+    recipients:
+      search_base: "ou=users,dc=example,dc=com"
+      query_filter: ""
 
 postfixmaps: []
diff --git a/templates/main.cf.j2 b/templates/main.cf.j2
index e818263..9085096 100644
--- a/templates/main.cf.j2
+++ b/templates/main.cf.j2
@@ -71,8 +71,8 @@ virtual_transport = dovecot
 
 {% if postfix.ldap.enable %}
 # LDAP config
-smtpd_sender_login_maps = proxy:ldap:/etc/postfix/virtual-senders.cf
-virtual_mailbox_maps = proxy:ldap:/etc/postfix/virtual-recipients.cf
+smtpd_sender_login_maps = ldap:/etc/postfix/virtual-senders.cf
+virtual_mailbox_maps = ldap:/etc/postfix/virtual-recipients.cf
 local_recipient_maps = $virtual_mailbox_maps
 {% endif %}
 
diff --git a/templates/virtual-senders.cf.j2 b/templates/virtual-senders.cf.j2
index 6699ad6..ded45f2 100644
--- a/templates/virtual-senders.cf.j2
+++ b/templates/virtual-senders.cf.j2
@@ -5,7 +5,7 @@ bind = yes
 server_host = {{ postfix.ldap.server_host }}
 search_base = {{ postfix.ldap.senders.search_base }}
 query_filter = {{ postfix.ldap.senders.query_filter }}
-result_attribute = cn
+result_attribute = uid
 {% else %}
 # LDAP is not configured for this server.
 {% endif %}