diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js
index f704f57c8..5f182cb65 100644
--- a/src/routes/test/oauth2-test.js
+++ b/src/routes/test/oauth2-test.js
@@ -1455,11 +1455,9 @@ describe('Password', function () {
         it('succeeds', function (done) {
             var scope = nock(config.adminOrigin())
                 .filteringPath(function (path) {
-                    path = path.replace(/accessToken=[^&]*/, 'accessToken=token');
-                    path = path.replace(/expiresAt=[^&]*/, 'expiresAt=1234');
                     return path;
                 })
-                .get('/?accessToken=token&expiresAt=1234').reply(200, {});
+                .get('/').reply(200, {});
 
             superagent.post(SERVER_URL + '/api/v1/session/password/reset')
                 .send({ password: 'ASF23$%somepassword', resetToken: USER_0.resetToken })
diff --git a/src/users.js b/src/users.js
index 7f0a3b635..0bf62cbb5 100644
--- a/src/users.js
+++ b/src/users.js
@@ -28,7 +28,6 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    clients = require('./clients.js'),
     crypto = require('crypto'),
     config = require('./config.js'),
     constants = require('./constants.js'),
@@ -43,7 +42,6 @@ var assert = require('assert'),
     qrcode = require('qrcode'),
     safe = require('safetydance'),
     speakeasy = require('speakeasy'),
-    tokendb = require('./tokendb.js'),
     userdb = require('./userdb.js'),
     util = require('util'),
     uuid = require('uuid'),
@@ -483,19 +481,7 @@ function setPassword(userId, newPassword, callback) {
                 if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new UsersError(UsersError.NOT_FOUND));
                 if (error) return callback(new UsersError(UsersError.INTERNAL_ERROR, error));
 
-                // Also generate a token so the new user can get logged in immediately
-                clients.get('cid-webadmin', function (error, result) {
-                    if (error) return callback(new UsersError(UsersError.INTERNAL_ERROR, error));
-
-                    var token = tokendb.generateToken();
-                    var expiresAt = Date.now() + constants.DEFAULT_TOKEN_EXPIRATION;
-
-                    tokendb.add(token, user.id, result.id, expiresAt, '*', function (error) {
-                        if (error) return callback(new UsersError(UsersError.INTERNAL_ERROR, error));
-
-                        callback(null, { token: token, expiresAt: expiresAt });
-                    });
-                });
+                callback();
             });
         });
     });