diff --git a/include/Swiften/Server/SimpleUserRegistry.cpp b/include/Swiften/Server/SimpleUserRegistry.cpp
index a9f24c62014c6118ab2f1ac6aff533b68bc62f95..36b421fcad6201ac365c816e2dd4a1144c2378e5 100644
--- a/include/Swiften/Server/SimpleUserRegistry.cpp
+++ b/include/Swiften/Server/SimpleUserRegistry.cpp
@@ -11,9 +11,16 @@ namespace Swift {
 SimpleUserRegistry::SimpleUserRegistry() {
 }
 
-bool SimpleUserRegistry::isValidUserPassword(const JID& user, const SafeByteArray& password) {
+void SimpleUserRegistry::isValidUserPassword(const JID& user, ServerFromClientSession *session, const SafeByteArray& password) {
 	std::map<JID,SafeByteArray>::const_iterator i = users.find(user);
-	return i != users.end() ? i->second == password : false;
+
+	
+	if (i != users.end() && i->second == password) {
+		session->handlePasswordValid();
+	}
+	else {
+		session->handlePasswordInvalid();
+	}
 }
 
 void SimpleUserRegistry::addUser(const JID& user, const std::string& password) {