diff --git a/docker/swarm/service/gerrit.yml b/docker/swarm/service/gerrit.yml
index 36e4faa..1fc2aab 100644
--- a/docker/swarm/service/gerrit.yml
+++ b/docker/swarm/service/gerrit.yml
@@ -20,7 +20,7 @@
             DB_ENV_MYSQL_DB: gerrit
             AUTH_TYPE: ${_param:gerrit_auth_type}
             LDAP_SERVER: ${_param:gerrit_ldap_server}
-            LDAP_ACCOUNTPATTERN: '(|(uid={username})(cn={username}))'
+            LDAP_ACCOUNTPATTERN: 'uid={username}'
             LDAP_ACCOUNTBASE: ${_param:gerrit_ldap_account_base}
             LDAP_GROUPBASE: ${_param:gerrit_ldap_group_base}
             LDAP_USERNAME: ${_param:gerrit_ldap_bind_user}
diff --git a/gerrit/client/init.yml b/gerrit/client/init.yml
index a9bb4de..0edd17e 100644
--- a/gerrit/client/init.yml
+++ b/gerrit/client/init.yml
@@ -14,6 +14,7 @@
         host: ${_param:cluster_vip_address}
         user: admin
         email: ${_param:gerrit_admin_email}
+        auth_method: basic
         http_port: 8080
         ssh_port: 29418
         protocol: http
diff --git a/jenkins/client/security/ldap.yml b/jenkins/client/security/ldap.yml
index 76126ed..ba53570 100644
--- a/jenkins/client/security/ldap.yml
+++ b/jenkins/client/security/ldap.yml
@@ -2,7 +2,9 @@
   _param:
     jenkins_security_ldap_manager_dn: ''
     jenkins_security_ldap_manager_password: ''
-    jenkins_security_ldap_user_search_filter: '(|(uid={0})(cn={0}))'
+    jenkins_security_ldap_user_search_filter: 'uid={0}'
+    jenkins_security_ldap_user_search_base: ''
+    jenkins_security_ldap_group_search_base: ''
   jenkins:
     client:
       security:
@@ -12,3 +14,5 @@
           manager_dn: ${_param:jenkins_security_ldap_manager_dn}
           manager_password: ${_param:jenkins_security_ldap_manager_password}
           user_search: ${_param:jenkins_security_ldap_user_search_filter}
+          user_search_base: ${_param:jenkins_security_ldap_user_search_base}
+          group_search_base: ${_param:jenkins_security_ldap_group_search_base}
diff --git a/openldap/client/people/admin.yml b/openldap/client/people/admin.yml
index c3341aa..fa1a2c8 100644
--- a/openldap/client/people/admin.yml
+++ b/openldap/client/people/admin.yml
@@ -18,6 +18,7 @@
                 sn: Root
                 homeDirectory: /home/admin
                 loginShell: /bin/bash
+                mail: ${_param:admin_email}
               classes:
                 - posixAccount
                 - inetOrgPerson