diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 4426458830b3a67bac124320c1b3af1d8a5241e5..6513511647ab678712b6adfcdaf0094e78e1fd8a 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -110,7 +110,12 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
-	item.setName(buddy->getAlias());
+	if (buddy->getAlias().empty()) {
+		item.setName(buddy->getJID().toBare().toString());
+	}
+	else {
+		item.setName(buddy->getAlias());
+	}
 	item.setGroups(buddy->getGroups());
 	item.setSubscription(Swift::RosterItemPayload::Both);