diff --git a/src/user.cpp b/src/user.cpp
index 242afbba9e96cd5c2e87b22e026c7f2ac8e0273a..82095c5a29f2b9268510a3f48719587f0345acb8 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -218,10 +218,17 @@ void User::handlePresence(Swift::Presence::ref presence) {
 	if (isMUC) {
 		if (presence->getType() == Swift::Presence::Unavailable) {
 			std::string room = Buddy::JIDToLegacyName(presence->getTo());
+			Conversation *conv = m_conversationManager->getConversation(room);
+			if (conv) {
+				conv->removeJID(presence->getFrom());
+				if (!conv->getJIDs().empty()) {
+					return;
+				}
+			}
+
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to left room " << room);
 			onRoomLeft(room);
 
-			Conversation *conv = m_conversationManager->getConversation(room);
 			if (conv) {
 				m_conversationManager->removeConversation(conv);
 				delete conv;
@@ -235,8 +242,14 @@ void User::handlePresence(Swift::Presence::ref presence) {
 				onReadyToConnect();
 			}
 			std::string room = Buddy::JIDToLegacyName(presence->getTo());
-			if (m_conversationManager->getConversation(room) != NULL) {
-				LOG4CXX_INFO(logger, m_jid.toString() << ": User has already tried to join room " << room << " as " << presence->getTo().getResource());
+			Conversation *conv = m_conversationManager->getConversation(room);
+			if (conv != NULL) {
+				if (std::find(conv->getJIDs().begin(), conv->getJIDs().end(), presence->getFrom()) != conv->getJIDs().end()) {
+					LOG4CXX_INFO(logger, m_jid.toString() << ": User has already tried to join room " << room << " as " << presence->getTo().getResource());
+				}
+				else {
+					conv->addJID(presence->getFrom());
+				}
 				return;
 			}