diff --git a/packages/accounts-twitter/twitter_server.js b/packages/accounts-twitter/twitter_server.js
index 63b626747d..23d35575b2 100644
--- a/packages/accounts-twitter/twitter_server.js
+++ b/packages/accounts-twitter/twitter_server.js
@@ -10,12 +10,17 @@
 
     return {
       options: {
-        // XXX Figure out what to do here
-        email: identity.screen_name + '@OAUTH1_TWITTER',
-        // XXX Do we want to keep the accessTokenSecret also?
-        services: {twitter: {id: identity.id, accessToken: oauth.accessToken}}
+        services: {
+          twitter: {
+            id: identity.id,
+            screenName: identity.screen_name,
+            accessToken: oauth.accessToken
+          }
+        }
       },
-      extra: {name: identity.name}
+      extra: {
+        name: identity.name
+      }
     };
   });
 }) ();