diff --git a/include/Swiften/Server/UserRegistry.h b/include/Swiften/Server/UserRegistry.h
index 5781802b70739961cfcc5e05d4c8c2a4217c5ced..2ded68e32f0f0514c79c47c780d6497e95c5ad55 100644
--- a/include/Swiften/Server/UserRegistry.h
+++ b/include/Swiften/Server/UserRegistry.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <Swiften/Base/SafeByteArray.h>
 #include <boost/signal.hpp>
+#include "Swiften/Server/ServerFromClientSession.h"
 
 namespace Swift {
 	class JID;
@@ -17,12 +18,8 @@ namespace Swift {
 		public:
 			virtual ~UserRegistry();
 
-			virtual bool isValidUserPassword(const JID& user, const SafeByteArray& password) = 0;
-
-			virtual void stopLogin(const JID &/*user*/) {};
-
-			boost::signal<void (const std::string &user)> onPasswordValid;
-			boost::signal<void (const std::string &user)> onPasswordInvalid;
+			virtual void isValidUserPassword(const JID& user, ServerFromClientSession *session, const SafeByteArray& password) = 0;
 
+			virtual void stopLogin(const JID &/*user*/, ServerFromClientSession *) {};
 	};
 }