diff --git a/core.js b/core.js
index eb8555e..be7ae5e 100755
--- a/core.js
+++ b/core.js
@@ -8,6 +8,7 @@ var md5 = require('MD5');
 var Users = mongoose.model('Users');
 var Notifications = mongoose.model('Notifications');
 var Challenges = mongoose.model('Challenges');
+var Tokens = mongoose.model('Tokens');
 
 var nextUserId = 0;
 global.usersById = {};
@@ -78,6 +79,9 @@ exports.login = function(sess, accessToken, accessTokenExtra, ghUser) {
 
     usersByGhId[ghUser.id] = addUser('github', ghUser);
 
+    // Save user token
+    Tokens.update({'token': accessToken}, update, {'upsert': true}).exec()
+
     Users
     .findOne({ 'user_id': usersByGhId[ghUser.id].github.id },
                'user_name', function (err, user) {
diff --git a/model/db.js b/model/db.js
index 142f50c..a65052d 100755
--- a/model/db.js
+++ b/model/db.js
@@ -72,5 +72,6 @@ mongoose.model('Users', Users)
 mongoose.model('Notifications', Notifications)
 mongoose.model('Challenges', Challenges)
 mongoose.model('Pulls', Pulls)
+mongoose.model('Tokens', Tokens)
 
 mongoose.connect('mongodb://localhost/rosedu-challenge')