diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp
index d79e0b72..55deeec9 100644
--- a/src/localbuddy.cpp
+++ b/src/localbuddy.cpp
@@ -24,6 +24,7 @@
 namespace Transport {
 
 LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id) : Buddy(rosterManager, id) {
+	m_status = Swift::StatusShow::None;
 }
 
 LocalBuddy::~LocalBuddy() {
diff --git a/src/rosterresponder.cpp b/src/rosterresponder.cpp
index 3c8554f3..d99e84fd 100644
--- a/src/rosterresponder.cpp
+++ b/src/rosterresponder.cpp
@@ -27,6 +27,7 @@
 #include "transport/user.h"
 #include "transport/usermanager.h"
 #include "transport/rostermanager.h"
+#include "transport/buddy.h"
 
 using namespace Swift;
 using namespace boost;
@@ -67,6 +68,41 @@ bool RosterResponder::handleGetRequest(const Swift::JID& from, const Swift::JID&
 
 bool RosterResponder::handleSetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<Swift::RosterPayload> payload) {
 	sendResponse(from, id, boost::shared_ptr<RosterPayload>(new RosterPayload()));
+
+	User *user = m_userManager->getUser(from.toBare().toString());
+	if (!user) {
+		return true;
+	}
+
+	if (payload->getItems().size() == 0) {
+		return true;
+	}
+
+	Swift::RosterItemPayload item = payload->getItems()[0];
+
+	Buddy *buddy = user->getRosterManager()->getBuddy(Buddy::JIDToLegacyName(item.getJID()));
+	if (buddy) {
+		if (item.getSubscription() == Swift::RosterItemPayload::Remove) {
+			std::cout << "BUDDY REMOVED\n";
+		}
+		else {
+			std::cout << "BUDDY UPDATED\n";
+		}
+	}
+	else if (item.getSubscription() != Swift::RosterItemPayload::Remove) {
+		// Roster push for this new buddy is sent by RosterManager
+		BuddyInfo buddyInfo;
+		buddyInfo.id = -1;
+		buddyInfo.alias = item.getName();
+		buddyInfo.legacyName = Buddy::JIDToLegacyName(item.getJID());
+		buddyInfo.subscription = "both";
+		buddyInfo.flags = 0;
+
+		buddy = user->getComponent()->getFactory()->createBuddy(user->getRosterManager(), buddyInfo);
+		user->getRosterManager()->setBuddy(buddy);
+		std::cout << "BUDDY ADDED\n";
+	}
+
 	return true;
 }
 
diff --git a/src/sqlite3backend.cpp b/src/sqlite3backend.cpp
index 128921a7..565a5f84 100644
--- a/src/sqlite3backend.cpp
+++ b/src/sqlite3backend.cpp
@@ -240,7 +240,7 @@ long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 	BIND_INT(m_addBuddy, userId);
 	BIND_STR(m_addBuddy, buddyInfo.legacyName);
 	BIND_STR(m_addBuddy, buddyInfo.subscription);
-	BIND_STR(m_addBuddy, buddyInfo.groups[0]); // TODO: serialize groups
+	BIND_STR(m_addBuddy, buddyInfo.groups.size() == 0 ? "" : buddyInfo.groups[0]); // TODO: serialize groups
 	BIND_STR(m_addBuddy, buddyInfo.alias);
 	BIND_INT(m_addBuddy, buddyInfo.flags);