diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php
index 8bb1657bb50..f485b544249 100644
--- a/htdocs/includes/login/functions_ldap.php
+++ b/htdocs/includes/login/functions_ldap.php
@@ -155,14 +155,17 @@ function check_user_password_ldap($usertotest,$passwordtotest)
 					// On recherche le user dolibarr en fonction de son SID ldap
 					$sid = $ldap->getObjectSid($login);
 					if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+
+					$user=new User($db);
 					$resultFetchUser=$user->fetch($login,$sid);
 					if ($resultFetchUser > 0)
 					{
-						//TODO: on verifie si le login a change et on met a jour les attributs dolibarr
+						// On verifie si le login a change et on met a jour les attributs dolibarr
 						if ($user->login != $ldap->login && $ldap->login)
 						{
 							$user->login = $ldap->login;
 							$user->update($user);
+							// TODO Que faire si update echoue car on update avec un login deja existant.
 						}
 						//$resultUpdate = $user->update_ldap2dolibarr();
 					}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2a738596179..423808c1752 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -154,6 +154,7 @@ if (! isset($_SESSION["dol_login"]))
 			$result=include_once($authfile);
 			if ($result)
 			{
+				// Call function to check user/password
 			    $usertotest=$_POST["username"];
 			    $passwordtotest=$_POST["password"];
 				$function='check_user_password_'.$mode;
@@ -179,8 +180,7 @@ if (! isset($_SESSION["dol_login"]))
 		exit;
     }
 
-	if (!$resultFetchUser) $resultFetchUser=$user->fetch($login);
-
+	$resultFetchUser=$user->fetch($login);
 	if ($resultFetchUser <= 0)
 	{
 		dolibarr_syslog('User not found, connexion refused');