diff --git a/src/UserManager.cpp b/src/UserManager.cpp
index 5ad418f446fa9599cd3678f2a5ba80963b087a1a..f67409e629e2dc140afcea6ed68267e26697723d 100644
--- a/src/UserManager.cpp
+++ b/src/UserManager.cpp
@@ -217,7 +217,8 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 		if (m_component->inServerMode()) {
 			if (!registered) {
 				// If we need registration, stop login process because user is not registered
-				if (CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", false)) {
+				if (CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", false)
+					&& CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needPassword", true)) {
 					m_userRegistry->onPasswordInvalid(presence->getFrom());
 					return;
 				}