diff --git a/htdocs/includes/login/functions_dolibarr.php b/htdocs/includes/login/functions_dolibarr.php
index 1495fce4122..91b6a1ebe92 100644
--- a/htdocs/includes/login/functions_dolibarr.php
+++ b/htdocs/includes/login/functions_dolibarr.php
@@ -73,7 +73,8 @@ function check_user_password_dolibarr($usertotest,$passwordtotest)
 				// For compatibility with old versions
 				if (! $passok)
 				{
-					if ($passtyped == $passclear) $passok=true;
+					if ((! $passcrypted || $passtyped) 
+						&& ($passtyped == $passclear)) $passok=true;
 				}
 				
 				// Password ok ?