diff --git a/services/web/app/views/project/editor/header.pug b/services/web/app/views/project/editor/header.pug
index 1046244713..8bd37f707c 100644
--- a/services/web/app/views/project/editor/header.pug
+++ b/services/web/app/views/project/editor/header.pug
@@ -71,7 +71,7 @@ header.toolbar.toolbar-header.toolbar-with-labels(
 					popover-append-to-body="true"
 					popover-trigger="mouseenter"
 					ng-click="gotoUser(user)"
-				) {{ user.name.slice(0,1) }}
+				) {{ userInitial(user) }}
 			
 			span.dropdown(dropdown, ng-if="onlineUsersArray.length >= 4")
 				span.online-user.online-user-multi(
diff --git a/services/web/public/coffee/ide/online-users/controllers/OnlineUsersController.coffee b/services/web/public/coffee/ide/online-users/controllers/OnlineUsersController.coffee
index 2e87bf8e14..86ab35a16d 100644
--- a/services/web/public/coffee/ide/online-users/controllers/OnlineUsersController.coffee
+++ b/services/web/public/coffee/ide/online-users/controllers/OnlineUsersController.coffee
@@ -4,4 +4,10 @@ define [
 	App.controller "OnlineUsersController", ($scope, ide) ->
 		$scope.gotoUser = (user) ->
 			if user.doc? and user.row?
-				ide.editorManager.openDoc(user.doc, gotoLine: user.row + 1)
\ No newline at end of file
+				ide.editorManager.openDoc(user.doc, gotoLine: user.row + 1)
+
+		$scope.userInitial = (user) ->
+			if user.user_id == 'anonymous-user'
+				'?'
+			else
+				user.name.slice(0, 1)