diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserController.coffee
index 9954294577..d64883b23b 100644
--- a/services/web/app/coffee/Features/User/UserController.coffee
+++ b/services/web/app/coffee/Features/User/UserController.coffee
@@ -120,8 +120,9 @@ module.exports = UserController =
 		req.session.destroy (err)->
 			if err
 				logger.err err: err, 'error destorying session'
-			UserSessionsManager.untrackSession(user, sessionId)
-			SudoModeHandler.clearSudoMode(user._id)
+			if user?
+				UserSessionsManager.untrackSession(user, sessionId)
+				SudoModeHandler.clearSudoMode(user._id)
 			res.redirect '/login'
 
 	register : (req, res, next = (error) ->)->
diff --git a/services/web/app/coffee/Features/User/UserSessionsManager.coffee b/services/web/app/coffee/Features/User/UserSessionsManager.coffee
index 273c7fe4a9..57590a42b4 100644
--- a/services/web/app/coffee/Features/User/UserSessionsManager.coffee
+++ b/services/web/app/coffee/Features/User/UserSessionsManager.coffee
@@ -114,7 +114,7 @@ module.exports = UserSessionsManager =
 					callback(null)
 
 	touch: (user, callback=(err)->) ->
-		if !user
+		if !user?
 			logger.log {}, "no user to touch sessions for, returning"
 			return callback(null)
 		sessionSetKey = UserSessionsRedis.sessionSetKey(user)
@@ -125,7 +125,7 @@ module.exports = UserSessionsManager =
 			callback(null)
 
 	_checkSessions: (user, callback=(err)->) ->
-		if !user
+		if !user?
 			logger.log {}, "no user, returning"
 			return callback(null)
 		logger.log {user_id: user._id}, "checking sessions for user"