diff --git a/backends/twitter/TwitterPlugin.cpp b/backends/twitter/TwitterPlugin.cpp
index be4eec24458ec83a2c65d086ac8ba287f28a7be9..a4d35ca55de3f6a8e8a82750f4f47b6779bc7fc4 100644
--- a/backends/twitter/TwitterPlugin.cpp
+++ b/backends/twitter/TwitterPlugin.cpp
@@ -118,7 +118,7 @@ void TwitterPlugin::handleLoginRequest(const std::string &user, const std::strin
 	}
 	
 	LOG4CXX_INFO(logger, std::string("Received login request for ") + user)	
-	initUserSession(user, password);
+	initUserSession(user, legacyName, password);
 	handleConnected(user);
 	
 	LOG4CXX_INFO(logger, user << ": Adding Buddy " << adminLegacyName << " " << adminAlias)
@@ -417,11 +417,11 @@ bool TwitterPlugin::storeUserOAuthKeyAndSecret(const std::string user, const std
 	return true;
 }
 
-void TwitterPlugin::initUserSession(const std::string user, const std::string password)
+void TwitterPlugin::initUserSession(const std::string user, const std::string legacyName, const std::string password)
 {
 	boost::mutex::scoped_lock lock(userlock);
 
-	std::string username = user.substr(0,user.find('@'));
+	std::string username = legacyName;
 	std::string passwd = password;
 	LOG4CXX_INFO(logger, username + "  " + passwd)
 
@@ -446,7 +446,8 @@ void TwitterPlugin::initUserSession(const std::string user, const std::string pa
 		}
 	}
 
-	userdb[user].connectionState = NEW;			
+	userdb[user].connectionState = NEW;
+	userdb[user].legacyName = username;	
 	userdb[user].sessions->setTwitterUsername(username);
 	userdb[user].sessions->setTwitterPassword(passwd); 
 	userdb[user].sessions->getOAuth().setConsumerKey(consumerKey);
diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h
index 822dbf7ba8fadb6873de5cdd2da1e4282774a304..162b8b98f62c2c853d8c93aef748596dc6c79509 100644
--- a/backends/twitter/TwitterPlugin.h
+++ b/backends/twitter/TwitterPlugin.h
@@ -88,7 +88,7 @@ class TwitterPlugin : public NetworkPlugin {
 		
 		bool storeUserOAuthKeyAndSecret(const std::string user, const std::string OAuthKey, const std::string OAuthSecret);
 		
-		void initUserSession(const std::string user, const std::string password);
+		void initUserSession(const std::string user, const std::string legacyName, const std::string password);
 		
 		void OAuthFlowComplete(const std::string user, twitCurl *obj);
 		
@@ -152,6 +152,7 @@ class TwitterPlugin : public NetworkPlugin {
 		std::set<std::string> onlineUsers;
 		struct UserData
 		{
+			std::string legacyName;
 			User userTwitterObj;
 			std::string userImg;
 			twitCurl* sessions;