diff --git a/setup/lang/phpgw_de.lang b/setup/lang/phpgw_de.lang
index b0a070ccd3..22b99224e2 100644
--- a/setup/lang/phpgw_de.lang
+++ b/setup/lang/phpgw_de.lang
@@ -1,5 +1,6 @@
 %1 does not exist !!!	setup	de	%1 existiert nicht!!!
 %1 is %2%3 !!!	setup	de	%1 ist %2%3!!!
+(searching accounts and changing passwords)	setup	de	Benutzerkonten suchen und Passwörter ändern)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	de	*** Updaten Sie NICHT Ihre Datenbank via Setup, da das Update von der max_execution_time (max. Ausführungszeit für Skripte) unterbrochen werden kann. Ihre Datenbank ist dann in einem nicht mehr wiederherstellbaren Zustand (Ihre Daten sind VERLOREN)!!!
 *** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	de	*** Sie müssen die Änderungen manuell in Ihrer php.ini Datei (üblicherweise in /etc unter Linux) durchführen, um eGroupWare vollständig/fehlerfrei ausführen zu können!!!
 00 (disable)	setup	de	00 (abgeschaltet/empfohlen)
@@ -226,6 +227,7 @@ ldap import users	setup	de	LDAP-Benutzer importieren
 ldap modify	setup	de	LDAP Ändern
 ldap root password	setup	de	LDAP-Root-Passwort
 ldap rootdn	setup	de	LDAP rootdn
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	de	LDAP Suchfilter für Benutzerkonten, Vorgabe "(uid=%user)", %domain=eGW Domain
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	de	Zugang zu Setup auf die folgenden IP Adressen, Netzwerke oder Hostnamen beschränken (z.B. 127.0.0.1,10.1.1,myhost.dnydns.org)
 login to mysql -	setup	de	mysql aufrufen -
 logout	setup	de	Abmelden
diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang
index 67b32460c5..f42c36a5b5 100644
--- a/setup/lang/phpgw_en.lang
+++ b/setup/lang/phpgw_en.lang
@@ -1,5 +1,6 @@
 %1 does not exist !!!	setup	en	%1 does not exist !!!
 %1 is %2%3 !!!	setup	en	%1 is %2%3 !!!
+(searching accounts and changing passwords)	setup	en	(searching accounts and changing passwords)
 *** do not update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your db in an unrecoverable state (your data is lost) !!!	setup	en	*** Do NOT update your database via setup, as the update might be interrupted by the max_execution_time, which leaves your DB in an unrecoverable state (your data is lost) !!!
 *** you have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get egw fully working !!!	setup	en	*** You have to do the changes manualy in your php.ini (usualy in /etc on linux) in order to get eGW fully working !!!
 00 (disable)	setup	en	00 (disable / recomended)
@@ -223,6 +224,7 @@ ldap import users	setup	en	LDAP import users
 ldap modify	setup	en	LDAP Modify
 ldap root password	setup	en	LDAP root password
 ldap rootdn	setup	en	LDAP rootdn
+ldap search filter for accounts, default: "(uid=%user)", %domain=egw-domain	setup	en	LDAP search filter for accounts, default: "(uid=%user)", %domain=eGW-domain
 limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)	setup	en	Limit access to setup to the following addresses, networks or hostnames (e.g. 127.0.0.1,10.1.1,myhost.dnydns.org)
 login to mysql -	setup	en	Login to mysql -
 logout	setup	en	Logout
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index f624f8966f..abb534e0ff 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -271,21 +271,26 @@
    </tr>
 
    <tr class="row_on">
+    <td>{lang_LDAP_search_filter_for_accounts,_default:_"(uid=%user)",_%domain=eGW-domain}:</td>
+    <td><input name="newsettings[ldap_search_filter]" value="{value_ldap_search_filter}" size="40"></td>
+   </tr>
+
+   <tr class="row_off">
     <td>{lang_LDAP_groups_context}:</td>
     <td><input name="newsettings[ldap_group_context]" value="{value_ldap_group_context}" size="40"></td>
    </tr>
 
-   <tr class="row_off">
-    <td>{lang_LDAP_rootdn}:</td>
+   <tr class="row_on">
+    <td>{lang_LDAP_rootdn} {lang_(searching_accounts_and_changing_passwords)}:</td>
     <td><input name="newsettings[ldap_root_dn]" value="{value_ldap_root_dn}" size="40"></td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
     <td>{lang_LDAP_root_password}:</td>
     <td><input name="newsettings[ldap_root_pw]" type="password" value="{value_ldap_root_pw}"></td>
    </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td>{lang_LDAP_encryption_type}:</td>
     <td>
      <select name="newsettings[ldap_encryption_type]">
@@ -294,7 +299,7 @@
     </td>
    </tr>
 
-   <tr class="row_on">
+   <tr class="row_off">
      <td>{lang_Enable_LDAP_Version_3}:</td>
      <td>
       <select name="newsettings[ldap_version3]">
@@ -304,7 +309,7 @@
      </td>
     </tr>
 
-   <tr class="row_off">
+   <tr class="row_on">
     <td colspan="2">&nbsp;</td>
    </tr>