diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index d193492df71966a3f7a0d81f7023db7f1e5be2c9..f4d7867ee44dde6c0371de8ecfe39db9efc1a3cc 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -149,7 +149,7 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 	// Create user class if it's not there
 	if (!user) {
 		// Admin user is not legacy network user, so do not create User class instance for him
-		if (CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
+		if (m_component->inServerMode() && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 			return;
 		}