diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 4e6e4b01b9a96206c44b44e23e3ca03d1591ddf1..fd4305ce7eae16075ebd7030ef7a2052e9e18da3 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -247,7 +247,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")) {
+			if (!registered && (CONFIG_BOOL(m_component->getConfig(), "registration.auto_register") ||
+				!CONFIG_BOOL_DEFAULTED(m_component->getConfig(), "registration.needRegistration", true))) {
 				res.password = "";
 				res.jid = userkey;