diff --git a/src/userregistry.cpp b/src/userregistry.cpp
index 8d8a3975bd812c0ed7d6aa8fba6b081ad43609cc..a740e898e77319482cf841fb5b5045c0a1892ed2 100644
--- a/src/userregistry.cpp
+++ b/src/userregistry.cpp
@@ -20,7 +20,6 @@
 
 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "transport/userregistry.h"
 #include "transport/logging.h"
@@ -79,9 +78,6 @@ void UserRegistry::stopLogin(const Swift::JID& user, Swift::ServerFromClientSess
 			LOG4CXX_WARN(logger, key << ": Stopping login process (user probably disconnected while logging in), but this is not active session");
 		}
 	}
-	else {
-		LOG4CXX_WARN(logger, key << ": Stopping login process (user probably disconnected while logging in) for invalid user");
-	}
 
 	// ::removeLater can be called only by libtransport, not by Swift and libtransport
 	// takes care about user disconnecting itself, so don't call our signal.
@@ -96,21 +92,15 @@ void UserRegistry::onPasswordValid(const Swift::JID &user) {
 		users[key].session->handlePasswordValid();
 		users.erase(key);
 	}
-	else {
-		LOG4CXX_INFO(logger, key << ": onPasswordValid called for invalid user");
-	}
 }
 
 void UserRegistry::onPasswordInvalid(const Swift::JID &user, const std::string &error) {
 	std::string key = user.toBare().toString();
 	if (users.find(key) != users.end()) {
-		LOG4CXX_INFO(logger, key << ": Password is invalid");
+		LOG4CXX_INFO(logger, key << ": Password is invalid or there was an error when connecting the legacy network");
 		users[key].session->handlePasswordInvalid(error);
 		users.erase(key);
 	}
-	else {
-		LOG4CXX_INFO(logger, key << ": onPasswordInvalid called for invalid user");
-	}
 }
 
 void UserRegistry::handleRemoveTimeout(const Swift::JID &user) {