diff --git a/op/op.Login.php b/op/op.Login.php
index b4aa07fb2..b9a5b8c19 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -129,11 +129,11 @@ if (isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
 		$dn = false;
 		/* If bind succeed, then get the dn of for the user */
 		if ($bind) {
-            if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
-			    $search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$login.")".$settings->_ldapFilter.")");
-            } else {
-			    $search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$login);
-            }
+			if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
+				$search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$login.")".$settings->_ldapFilter.")");
+			} else {
+				$search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$login);
+			}
 			if (!is_bool($search)) {
 				$info = ldap_get_entries($ds, $search);
 				if (!is_bool($info) && $info["count"]>0) {
@@ -158,39 +158,24 @@ if (isset($settings->_ldapHost) && strlen($settings->_ldapHost)>0) {
 			$user = $dms->getUserByLogin($login);
 			if (is_bool($user) && !$settings->_restricted) {
 				// Retrieve the user's LDAP information.
-        if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
-			    $search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$login.")".$settings->_ldapFilter.")");
-        } else {
-					$search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut . $login); 
+				if (isset($settings->_ldapFilter) && strlen($settings->_ldapFilter) > 0) {
+					$search = ldap_search($ds, $settings->_ldapBaseDN, "(&(".$ldapSearchAttribut.$login.")".$settings->_ldapFilter.")");
+				} else {
+					$search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut.$login); 
 				}
-			}
-			$bind = @ldap_bind($ds, $dn, $pwd);
-			if ($bind) {
-				// Successfully authenticated. Now check to see if the user exists within
-				// the database. If not, add them in, but do not add their password.
-				$user = $dms->getUserByLogin($login);
-				if (is_bool($user) && !$settings->_restricted) {
-					// Retrieve the user's LDAP information.
-					
-					
-					/* new code by doudoux  - TO BE TESTED */
-					$search = ldap_search($ds, $settings->_ldapBaseDN, $ldapSearchAttribut . $login); 
-					/* old code */
-					//$search = ldap_search($ds, $dn, "uid=".$login);
-					
-					if (!is_bool($search)) {
-						$info = ldap_get_entries($ds, $search);
-						if (!is_bool($info) && $info["count"]==1 && $info[0]["count"]>0) {
-							$user = $dms->addUser($login, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "");
-						}
+
+				if (!is_bool($search)) {
+					$info = ldap_get_entries($ds, $search);
+					if (!is_bool($info) && $info["count"]==1 && $info[0]["count"]>0) {
+						$user = $dms->addUser($login, null, $info[0]['cn'][0], $info[0]['mail'][0], $settings->_language, $settings->_theme, "");
 					}
 				}
-				if (!is_bool($user)) {
-					$userid = $user->getID();
-				}
 			}
-			ldap_close($ds);
+			if (!is_bool($user)) {
+				$userid = $user->getID();
+			}
 		}
+		ldap_close($ds);
 	}
 }
 }