diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 4a36eebf..2d9a5fbf 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -252,8 +252,8 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 		// We allow auto_register feature in gateway-mode. This allows IRC user to register
 		// the transport just by joining the room.
 		if (!m_component->inServerMode()) {
-			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register") ||
-				!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true))) {
+			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register")
+				/*!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true)*/)) {
 				res.password = "";
 				res.jid = userkey;