diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 777c2d654db855efc24e27e17ca3a09c96ecaf7c..dc18158d45562d3a0d389e6b8f8b37de807c1a28 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -53,14 +53,14 @@ void RosterManager::sendBuddyRosterPush(AbstractBuddy *buddy) {
 	payload->addItem(item);
 
 	Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_component->getIQRouter(), m_user->getJID().toBare());
-	request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, buddy->getSafeName()));
+	request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, buddy->getName()));
 	request->send();
 }
 
 void RosterManager::setBuddyCallback(AbstractBuddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 
-	m_buddies[buddy->getSafeName()] = buddy;
+	m_buddies[buddy->getName()] = buddy;
 	onBuddySet(buddy);
 
 	if (m_component->inServerMode()) {
@@ -73,7 +73,7 @@ void RosterManager::setBuddyCallback(AbstractBuddy *buddy) {
 }
 
 void RosterManager::unsetBuddy(AbstractBuddy *buddy) {
-	m_buddies.erase(buddy->getSafeName());
+	m_buddies.erase(buddy->getName());
 	onBuddyUnset(buddy);
 }
 
@@ -83,4 +83,8 @@ void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error
 	}
 }
 
+AbstractBuddy *RosterManager::getBuddy(const std::string &name) {
+	return m_buddies[name];
+}
+
 }
\ No newline at end of file