diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp
index ef695e17cf0fa4bb4e5947e86abea2c034a49b23..c4af3d0516b7d77c1ab12dc72ffca196e4e33f91 100644
--- a/src/localbuddy.cpp
+++ b/src/localbuddy.cpp
@@ -75,9 +75,7 @@ void LocalBuddy::setAlias(const std::string &alias) {
 	m_alias = alias;
 
 	if (changed) {
-		if (getRosterManager()->getUser()->getComponent()->inServerMode() || getRosterManager()->isRemoteRosterSupported()) {
-			getRosterManager()->sendBuddyRosterPush(this);
-		}
+		getRosterManager()->doUpdateBuddy(this);
 		getRosterManager()->storeBuddy(this);
 	}
 }
@@ -95,9 +93,7 @@ void LocalBuddy::setGroups(const std::vector<std::string> &groups) {
 
 	m_groups = groups;
 	if (changed) {
-		if (getRosterManager()->getUser()->getComponent()->inServerMode() || getRosterManager()->isRemoteRosterSupported()) {
-			getRosterManager()->sendBuddyRosterPush(this);
-		}
+		getRosterManager()->doUpdateBuddy(this);
 		getRosterManager()->storeBuddy(this);
 	}
 }