diff --git a/src/userregistration.cpp b/src/userregistration.cpp
index 363812ce6e057539d370f3e4d744f10ca42196d5..cb512f8a24ef43ceb5170be0efcea234fc8abf1d 100644
--- a/src/userregistration.cpp
+++ b/src/userregistration.cpp
@@ -56,21 +56,11 @@ bool UserRegistration::registerUser(const UserInfo &row) {
 
 	m_storageBackend->setUser(row);
 
-	Swift::Presence::ref response = Swift::Presence::create();
-	response->setFrom(m_component->getJID());
-	response->setTo(Swift::JID(row.jid));
-	response->setType(Swift::Presence::Subscribe);
-	m_component->getStanzaChannel()->sendPresence(response);
-
-	onUserRegistered(row);
+	//same as in unregisterUser but here we have to pass UserInfo to handleRegisterRRResponse
+	AddressedRosterRequest::ref request = AddressedRosterRequest::ref(new AddressedRosterRequest(m_component->getIQRouter(),row.jid));
+	request->onResponse.connect(boost::bind(&UserRegistration::handleRegisterRemoteRosterResponse, this, _1, _2, row));
+	request->send();
 
-	BOOST_FOREACH(const std::string &notify_jid, CONFIG_VECTOR(m_component->getConfig(),"registration.notify_jid")) {
-		boost::shared_ptr<Swift::Message> msg(new Swift::Message());
-		msg->setBody(std::string("registered: ") + row.jid);
-		msg->setTo(notify_jid);
-		msg->setFrom(m_component->getJID());
-		m_component->getStanzaChannel()->sendMessage(msg);
-	}
 	return true;
 }
 
@@ -91,6 +81,34 @@ bool UserRegistration::unregisterUser(const std::string &barejid) {
 	return true;
 }
 
+void UserRegistration::handleRegisterRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> payload, Swift::ErrorPayload::ref remoteRosterNotSupported /*error*/, const UserInfo &row){
+	if (remoteRosterNotSupported || !payload) {
+		Swift::Presence::ref response = Swift::Presence::create();
+		response->setFrom(m_component->getJID());
+		response->setTo(Swift::JID(row.jid));
+		response->setType(Swift::Presence::Subscribe);
+		m_component->getStanzaChannel()->sendPresence(response);
+	}
+	else{
+		Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
+		Swift::RosterItemPayload item;
+		item.setJID(m_component->getJID());
+		item.setSubscription(Swift::RosterItemPayload::Both);
+		payload->addItem(item);
+		Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, row.jid, m_component->getIQRouter());
+		request->send();
+	}
+	onUserRegistered(row);
+
+	BOOST_FOREACH(const std::string &notify_jid, CONFIG_VECTOR(m_component->getConfig(),"registration.notify_jid")) {
+	boost::shared_ptr<Swift::Message> msg(new Swift::Message());
+	msg->setBody(std::string("registered: ") + row.jid);
+	msg->setTo(notify_jid);
+	msg->setFrom(m_component->getJID());
+	m_component->getStanzaChannel()->sendMessage(msg);
+	}
+}
+
 void UserRegistration::handleUnregisterRemoteRosterResponse(boost::shared_ptr<Swift::RosterPayload> payload, Swift::ErrorPayload::ref remoteRosterNotSupported /*error*/, const std::string &barejid) {
 	UserInfo userInfo;
 	bool registered = m_storageBackend->getUser(barejid, userInfo);