diff --git a/src/user.cpp b/src/user.cpp
index 5819f4bf3efc44db54f941fc94bc6fd50c6331d2..c1db53f612f01a6c96949c1b89cd6e7c5536c75b 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -27,6 +27,7 @@
 #include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
+#include "Swiften/Elements/MUCPayload.h"
 
 namespace Transport {
 
@@ -81,6 +82,13 @@ void User::handlePresence(Swift::Presence::ref presence) {
 			}
 		}
 	}
+	std::cout << "HANDLE PRESENCE\n";
+	bool isMUC = presence->getPayload<Swift::MUCPayload>() != NULL || *presence->getTo().getNode().c_str() == '#';
+	if (isMUC) {
+		std::cout << "AAAAAAAAA\n";
+		onRoomJoined(presence->getTo().getNode(), presence->getTo().getResource(), "");
+		return;
+	}
 
 
 	if (highest) {