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;
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 671509f45614716c0bcde841534a3c16e56a4497..618be97e6cc563f58947a6805d47337e52ca47b9 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -150,6 +150,7 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 	// Create user class if it's not there
 	if (!user) {
 		// Admin user is not legacy network user, so do not create User class instance for him
+/*
 		if (m_component->inServerMode() && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 			// Send admin contact to the user.
 			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
@@ -168,6 +169,30 @@ void UserManager::handlePresence(Swift::Presence::ref presence) {
 			m_component->getStanzaChannel()->sendPresence(response);
 			return;
 		}
+*/
+		if (m_component->inServerMode()) {
+		//  && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
+		    std::list<std::string> const &x = CONFIG_LIST(m_component->getConfig(),"service.admin_jid");
+		    if (std::find(x.begin(), x.end(), presence->getFrom().toBare().toString()) != x.end()) {
+		
+			// Send admin contact to the user.
+			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
+			Swift::RosterItemPayload item;
+			item.setJID(m_component->getJID());
+			item.setName("Admin");
+			item.setSubscription(Swift::RosterItemPayload::Both);
+			payload->addItem(item);
+
+			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
+			request->send();
+
+			Swift::Presence::ref response = Swift::Presence::create();
+			response->setTo(presence->getFrom());
+			response->setFrom(m_component->getJID());
+			m_component->getStanzaChannel()->sendPresence(response);
+			return;
+		    }
+		}
 
 		// No user and unavailable presence -> answer with unavailable
 		if (presence->getType() == Swift::Presence::Unavailable) {
diff --git a/src/userregistry.cpp b/src/userregistry.cpp
index 81f6806ce1867feb5722186a9a92a4e014242e1e..1b79c014f66c63b52d529c6738011e92885533e2 100644
--- a/src/userregistry.cpp
+++ b/src/userregistry.cpp
@@ -38,16 +38,19 @@ UserRegistry::UserRegistry(Config *cfg, Swift::NetworkFactories *factories) {
 UserRegistry::~UserRegistry() { m_removeTimer->stop(); }
 
 void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFromClientSession *session, const Swift::SafeByteArray& password) {
-	if (!CONFIG_STRING(config, "service.admin_jid").empty() && user.toBare().toString() == CONFIG_STRING(config, "service.admin_jid")) {
-		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
+
+	if (!CONFIG_STRING(config, "service.admin_jid").empty() ) {
+		std::list<std::string> const &x = CONFIG_LIST(config,"service.admin_jid");
+		if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
+		    if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 			session->handlePasswordValid();
-		}
-		else {
+		    }
+		    else {
 			session->handlePasswordInvalid();
-		}
-		return;
+		    }
+		    return;
+	    }
 	}
-
 	std::string key = user.toBare().toString();
 
 	// Users try to connect twice