diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg
index 75735b9716ef03a6caf97beccf541fbd71a8c3fa..edb5af77b0daf70d9727edcba749e30e6db116ac 100644
--- a/spectrum/src/sample.cfg
+++ b/spectrum/src/sample.cfg
@@ -14,8 +14,8 @@ admin_password=test
 #cert_password=test #password to that certificate if any
 users_per_backend=10
 #backend=../..//backends/swiften/spectrum2_swiften_backend
-#backend=../../backends/twitter/spectrum2_twitter_backend
-backend=/home/hanzz/code/libtransport/backends/libcommuni/spectrum2_libcommuni_backend
+backend=../../backends/twitter/spectrum2_twitter_backend
+#backend=/home/hanzz/code/libtransport/backends/libcommuni/spectrum2_libcommuni_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=any
diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp
index 72f6af25a248ed18c5b6e0df7f91b6c293b34348..b91a9e432be1198d9404edabc31446a9328ec9d1 100644
--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@@ -200,7 +200,7 @@ void RosterManager::sendBuddyUnsubscribePresence(Buddy *buddy) {
 void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
-	response->setFrom(buddy->getJID());
+	response->setFrom(buddy->getJID().toBare());
 	response->setType(Swift::Presence::Subscribe);
 	if (!buddy->getAlias().empty()) {
 		response->addPayload(boost::make_shared<Swift::Nickname>(buddy->getAlias()));
diff --git a/src/tests/rostermanager.cpp b/src/tests/rostermanager.cpp
index b9df7a0fbdef36782a441e7a1cf9695136d3ccbb..5b58a72204ec65abe1b64f4bd5cf9944036c1de0 100644
--- a/src/tests/rostermanager.cpp
+++ b/src/tests/rostermanager.cpp
@@ -70,6 +70,7 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
 		CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
 		CPPUNIT_ASSERT(getStanza(received[0])->getPayload<Swift::Nickname>());
 		CPPUNIT_ASSERT_EQUAL(std::string("Buddy 1"), getStanza(received[0])->getPayload<Swift::Nickname>()->getNickname());
+		CPPUNIT_ASSERT_EQUAL(std::string("buddy1@localhost"), getStanza(received[0])->getFrom().toString());
 		
 	}