diff --git a/config/passport.js b/config/passport.js
index a5b04915e4..09099d5196 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -104,7 +104,7 @@ passport.use('tumblr', new OAuthStrategy({
   },
   function (req, token, tokenSecret, profile, done) {
     User.findById(req.user._id, function(err, user) {
-      user.tokens.tumblr = token;
+      user.tokens.push({ kind: 'tumblr', token: token, tokenSecret: tokenSecret });
       user.save(function(err) {
         done(err, req.user);
       });
diff --git a/controllers/api.js b/controllers/api.js
index ec26c42900..9213b116ff 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -73,6 +73,13 @@ exports.getTumblr = function(req, res) {
     });
   }
 
+  var client = tumblr.createClient({
+    consumer_key: '<consumer key>',
+    consumer_secret: '<consumer secret>',
+    token: '<oauth token>',
+    token_secret: '<oauth token secret>'
+  });
+
   res.render('api/tumblr', {
     title: 'Tumblr API',
     user: req.user
diff --git a/models/User.js b/models/User.js
index c9e6276a1a..dd96691b00 100644
--- a/models/User.js
+++ b/models/User.js
@@ -8,6 +8,7 @@ var userSchema = new mongoose.Schema({
   password: String,
 
   // OAuth 2.0 authentication
+  tokens: Array,
   provider: String,
   facebook: String,
   twitter: String,
@@ -22,17 +23,10 @@ var userSchema = new mongoose.Schema({
     location: { type: String, default: '' },
     website: { type: String, default: '' },
     picture: { type: String, default: 'http://bit.ly/1cppDAL' }
-  },
+  }
 
   // API access tokens
-  tokens: {
-    google: String,
-    facebook: String,
-    foursquare: String,
-    twitter: String,
-    github: String,
-    tumblr: String
-  }
+
 });
 
 userSchema.path('password').validate(function(password) {