diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index a89117b6..bb8eb680 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -195,6 +195,7 @@ static void handleBuddyPayload(LocalBuddy *buddy, const pbnetwork::Buddy &payloa
 	// Set alias only if it's not empty. Backends are allowed to send empty alias if it has
 	// not changed.
 	if (!payload.alias().empty()) {
+		LOG4CXX_INFO(logger, "Setting alias to " << payload.alias() << " " << buddy->getAlias());
 		buddy->setAlias(payload.alias());
 	}
 
diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 44264588..65135116 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);