diff --git a/src/admininterface.cpp b/src/admininterface.cpp
index 769d002f53feea97b28259cb9440312b9328f831..5b5a50a3664f8086aa680fd92097cf81ed58011d 100644
--- a/src/admininterface.cpp
+++ b/src/admininterface.cpp
@@ -59,11 +59,13 @@ void AdminInterface::handleMessageReceived(Swift::Message::ref message) {
 	if (!message->getTo().getNode().empty())
 		return;
 
-	if (message->getFrom().toBare().toString() != CONFIG_STRING(m_component->getConfig(), "service.admin_jid")) {
-		LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
-		return;
+	std::list<std::string> const &x = CONFIG_LIST(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;