From 2d78b30f625fdbde644b0241f881a309247cfc07 Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Tue, 19 May 2020 09:22:34 +0200
Subject: [PATCH] Add check if password exist in login, to show correct error
 message if account isn't activated yet

---
 src/cpp/model/Session.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp
index 4f4714016..9c4a44650 100644
--- a/src/cpp/model/Session.cpp
+++ b/src/cpp/model/Session.cpp
@@ -653,7 +653,7 @@ UserStates Session::loadUser(const std::string& email, const std::string& passwo
 		//mSessionUser = new User(email.data());
 	}
 	if (mSessionUser->getUserState() >= USER_LOADED_FROM_DB) {
-		if (!mSessionUser->validatePwd(password, this)) {
+		if (mNewUser->getModel()->getPasswordHashed() && !mSessionUser->validatePwd(password, this)) {
 			unlock();
 			return USER_PASSWORD_INCORRECT;
 		}