diff --git a/include/Swiften/Server/ServerFromClientSession.h b/include/Swiften/Server/ServerFromClientSession.h
index 77ed0f1b5d59542ab564e8cf47b3bf67eb411ac4..1de5ac9b5f348fba065ed12267e1163f8b4a8407 100644
--- a/include/Swiften/Server/ServerFromClientSession.h
+++ b/include/Swiften/Server/ServerFromClientSession.h
@@ -39,7 +39,8 @@ namespace Swift {
 					PayloadParserFactoryCollection* payloadParserFactories, 
 					PayloadSerializerCollection* payloadSerializers,
 					UserRegistry* userRegistry,
-					XMLParserFactory* factory);
+					XMLParserFactory* factory,
+					Swift::JID remoteJID = Swift::JID());
 			~ServerFromClientSession();
 
 			boost::signal<void ()> onSessionStarted;
@@ -55,7 +56,7 @@ namespace Swift {
 			}
 
 			void handlePasswordValid();
-			void handlePasswordInvalid();
+			void handlePasswordInvalid(const std::string &error = "");
 
 		private:
 			void handleElement(boost::shared_ptr<Element>);