diff --git a/services/real-time/app/coffee/Router.coffee b/services/real-time/app/coffee/Router.coffee
index a8bdd7c7b1..64fdb6931d 100644
--- a/services/real-time/app/coffee/Router.coffee
+++ b/services/real-time/app/coffee/Router.coffee
@@ -35,69 +35,71 @@ module.exports = Router =
 		app.get "/clients/:client_id", HttpController.getConnectedClient
 
 		app.post "/project/:project_id/message/:message", httpAuth, bodyParser.json(limit: "5mb"), HttpApiController.sendMessage
-		
+
 		session.on 'connection', (error, client, session) ->
 			if error?
 				logger.err err: error, "error when client connected"
 				client?.disconnect()
 				return
-			
+
 			metrics.inc('socket-io.connection')
-			
+
 			logger.log session: session, client_id: client.id, "client connected"
-			
-			if !session or !session.user?
-				user = {_id: "anonymous-user"}
-			else
+
+			if session?.passport?.user?
+				user = session.passport.user
+			else if session?.user?
 				user = session.user
-				
+			else
+				user = {_id: "anonymous-user"}
+
 			client.on "joinProject", (data = {}, callback) ->
 				WebsocketController.joinProject client, user, data.project_id, (err, args...) ->
 					if err?
 						Router._handleError callback, err, client, "joinProject", {project_id: data.project_id, user_id: user?.id}
 					else
 						callback(null, args...)
-						
+
 			client.on "disconnect", () ->
 				metrics.inc('socket-io.disconnect')
 				WebsocketController.leaveProject io, client, (err) ->
 					if err?
 						Router._handleError null, err, client, "leaveProject"
-						
-				
+
+
 			client.on "joinDoc", (doc_id, fromVersion, callback) ->
 				# fromVersion is optional
 				if typeof fromVersion == "function"
 					callback = fromVersion
 					fromVersion = -1
-				
+
 				WebsocketController.joinDoc client, doc_id, fromVersion, (err, args...) ->
 					if err?
 						Router._handleError callback, err, client, "joinDoc", {doc_id, fromVersion}
 					else
 						callback(null, args...)
-						
+
 			client.on "leaveDoc", (doc_id, callback) ->
 				WebsocketController.leaveDoc client, doc_id, (err, args...) ->
 					if err?
 						Router._handleError callback, err, client, "leaveDoc"
 					else
 						callback(null, args...)
-						
+
 			client.on "clientTracking.getConnectedUsers", (callback = (error, users) ->) ->
 				WebsocketController.getConnectedUsers client, (err, users) ->
 					if err?
 						Router._handleError callback, err, client, "clientTracking.getConnectedUsers"
 					else
 						callback(null, users)
-						
+
 			client.on "clientTracking.updatePosition", (cursorData, callback = (error) ->) ->
 				WebsocketController.updateClientPosition client, cursorData, (err) ->
 					if err?
 						Router._handleError callback, err, client, "clientTracking.updatePosition"
 					else
 						callback()
-						
+
 			client.on "applyOtUpdate", (doc_id, update, callback = (error) ->) ->
 				WebsocketController.applyOtUpdate client, doc_id, update, (err) ->
 					if err?