diff --git a/src/admininterface.cpp b/src/admininterface.cpp
index 913484bef708e13ee96f88a5117a7d0990d21a7e..85dca619b4755975f260482516b7a574ffe74d40 100644
--- a/src/admininterface.cpp
+++ b/src/admininterface.cpp
@@ -57,22 +57,7 @@ AdminInterface::AdminInterface(Component *component, UserManager *userManager, N
 AdminInterface::~AdminInterface() {
 }
 
-void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
-	if (!message->getTo().getNode().empty())
-		return;
-
-	std::vector<std::string> const &x = CONFIG_VECTOR(m_component->getConfig(),"service.admin_jid");
-	if (std::find(x.begin(), x.end(), message->getFrom().toBare().toString()) == x.end()) {
-	    LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
-	    return;
-	
-	}
-	
-	// Ignore empty messages
-	if (message->getBody().empty()) {
-		return;
-	}
-
+void AdminInterface::handleQuery(Swift::Message::ref message) {
 	LOG4CXX_INFO(logger, "Message from admin received");
 	message->setTo(message->getFrom());
 	message->setFrom(m_component->getJID());
@@ -345,6 +330,25 @@ void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
 	else {
 		message->setBody("Unknown command. Try \"help\"");
 	}
+}
+
+void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
+	if (!message->getTo().getNode().empty())
+		return;
+
+	std::vector<std::string> const &x = CONFIG_VECTOR(m_component->getConfig(),"service.admin_jid");
+	if (std::find(x.begin(), x.end(), message->getFrom().toBare().toString()) == x.end()) {
+	    LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
+	    return;
+	
+	}
+	
+	// Ignore empty messages
+	if (message->getBody().empty()) {
+		return;
+	}
+
+	handleQuery(message);
 
 	m_component->getStanzaChannel()->sendMessage(message);
 }