diff --git a/services/web/app/coffee/controllers/UserController.coffee b/services/web/app/coffee/controllers/UserController.coffee
index 92e8fe0d2d..2f2979fa59 100644
--- a/services/web/app/coffee/controllers/UserController.coffee
+++ b/services/web/app/coffee/controllers/UserController.coffee
@@ -170,6 +170,7 @@ module.exports =
 		metrics.inc "user.password-change"
 		oldPass = req.body.currentPassword
 		AuthenticationManager.authenticate _id: req.session.user._id, oldPass, (err, user)->
+			return callback(err) if err?
 			if(user)
 				logger.log user: req.session.user, "changing password"
 				newPassword1 = req.body.newPassword1
@@ -198,17 +199,20 @@ module.exports =
 	redirectUserToDropboxAuth: (req, res)->
 		user_id = req.session.user._id
 		dropboxHandler.getDropboxRegisterUrl user_id, (err, url)->
+			return callback(err) if err?
 			logger.log url:url, "redirecting user for dropbox auth"
 			res.redirect url
 
 	completeDropboxRegistration: (req, res)->
 		user_id = req.session.user._id
 		dropboxHandler.completeRegistration user_id, (err, success)->
+			return callback(err) if err?
 			res.redirect('/user/settings#dropboxSettings')
 
 	unlinkDropbox: (req, res)->
 		user_id = req.session.user._id
 		dropboxHandler.unlinkAccount user_id, (err, success)->
+			return callback(err) if err?
 			res.redirect('/user/settings#dropboxSettings')
 
 	deleteUser: (req, res)->