diff --git a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp
index b708d346f..53764b301 100644
--- a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp
+++ b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp
@@ -164,6 +164,9 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params)
 
 				if (str_val.size() > 0) {
 					
+					if (!user->hasPassword() || isOldPasswordValid(updates, jsonErrorsArray))
+					{
+
 					if (!user->hasPassword() || isOldPasswordValid(updates, jsonErrorsArray))
 					{
 						NotificationList errors;