diff --git a/src/tests/user.cpp b/src/tests/user.cpp
index bbafedbb1d90e15f00b630ba55c83e70e1026777..054cc100984c219f01fde0b65b3205cfec84a004 100644
--- a/src/tests/user.cpp
+++ b/src/tests/user.cpp
@@ -30,8 +30,10 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResources);
 	CPPUNIT_TEST(handlePresenceLeaveRoomTwoResourcesOneDisconnects);
 	CPPUNIT_TEST(leaveJoinedRoom);
+	CPPUNIT_TEST(joinRoomBeforeConnected);
 	CPPUNIT_TEST(handleDisconnected);
 	CPPUNIT_TEST(handleDisconnectedReconnect);
+	CPPUNIT_TEST(joinRoomHandleDisconnectedRejoin);
 	CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -318,6 +320,56 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 		user = userManager->getUser("user@localhost");
 		CPPUNIT_ASSERT(user);
 		CPPUNIT_ASSERT(readyToConnect);
+
+		Swift::Presence::ref response = Swift::Presence::create();
+		response->setTo("localhost");
+		response->setFrom("user@localhost/resource");
+		injectPresence(response);
+		loop->processEvents();
+	}
+
+	void joinRoomBeforeConnected() {
+		User *user = userManager->getUser("user@localhost");
+		user->setConnected(false);
+
+		Swift::Presence::ref response = Swift::Presence::create();
+		response->setTo("#room@localhost/hanzz");
+		response->setFrom("user@localhost/resource");
+
+		Swift::MUCPayload *payload = new Swift::MUCPayload();
+		payload->setPassword("password");
+		response->addPayload(boost::shared_ptr<Swift::Payload>(payload));
+		injectPresence(response);
+		loop->processEvents();
+
+		// no presence received in server mode, just disco#info
+		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
+		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::DiscoInfo>());
+
+		CPPUNIT_ASSERT_EQUAL(std::string(""), room);
+		CPPUNIT_ASSERT_EQUAL(std::string(""), roomNickname);
+		CPPUNIT_ASSERT_EQUAL(std::string(""), roomPassword);
+
+		user->setConnected(true);
+		CPPUNIT_ASSERT_EQUAL(std::string("#room"), room);
+		CPPUNIT_ASSERT_EQUAL(std::string("hanzz"), roomNickname);
+		CPPUNIT_ASSERT_EQUAL(std::string("password"), roomPassword);
+	}
+
+	void joinRoomHandleDisconnectedRejoin() {
+		User *user = userManager->getUser("user@localhost");
+		handlePresenceJoinRoom();
+		handleDisconnectedReconnect();
+		room = "";
+		roomNickname = "";
+		roomPassword = "";
+		received.clear();
+		user->setConnected(true);
+
+		CPPUNIT_ASSERT_EQUAL(std::string("#room"), room);
+		CPPUNIT_ASSERT_EQUAL(std::string("hanzz"), roomNickname);
+		CPPUNIT_ASSERT_EQUAL(std::string("password"), roomPassword);
+		CPPUNIT_ASSERT_EQUAL(0, (int) received.size());
 	}
 
 };