diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 4551648d..8177ca35 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -75,6 +75,7 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
 	item.setGroups(buddy->getGroups());
+	item.setSubscription(Swift::RosterItemPayload::Both);
 
 	payload->addItem(item);
 
@@ -186,6 +187,7 @@ Swift::RosterPayload::ref RosterManager::generateRosterPayload() {
 		item.setJID(buddy->getJID().toBare());
 		item.setName(buddy->getAlias());
 		item.setGroups(buddy->getGroups());
+		item.setSubscription(Swift::RosterItemPayload::Both);
 		payload->addItem(item);
 	}
 	return payload;
diff --git a/src/user.cpp b/src/user.cpp
index 4b64736c..6fdda56e 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -139,9 +139,9 @@ void User::handleDisconnected(const std::string &error) {
 	msg->setTo(m_jid.toBare());
 	msg->setFrom(m_component->getJID());
 	m_component->getStanzaChannel()->sendMessage(msg);
-	std::cout << "aaaaaa\n";
+
 	if (m_component->inServerMode()) {
-// 		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
+		dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
 	}
 
 	m_userManager->removeUser(this);