diff --git a/services/web/app/views/project/editor/track-changes.jade b/services/web/app/views/project/editor/track-changes.jade
index 305be2ac03..5158bc835d 100644
--- a/services/web/app/views/project/editor/track-changes.jade
+++ b/services/web/app/views/project/editor/track-changes.jade
@@ -76,8 +76,8 @@ div#trackChanges(ng-show="ui.view == 'track-changes'")
 							div.user(ng-repeat="update_user in update.meta.users")
 								.color-square(ng-if="update_user != null", ng-style="{'background-color': 'hsl({{ update_user.hue }}, 70%, 50%)'}")
 								.color-square(ng-if="update_user == null", ng-style="{'background-color': 'hsl(100, 70%, 50%)'}")
-								.name(ng-if="update_user.id != user.id" ng-bind="displayName(update_user)") 
-								.name(ng-if="update_user.id == user.id") You
+								.name(ng-if="update_user && update_user.id != user.id" ng-bind="displayName(update_user)") 
+								.name(ng-if="update_user && update_user.id == user.id") You
 								.name(ng-if="update_user == null") #{translate("anonymous")}
 							div.user(ng-if="update.meta.users.length == 0")
 								.color-square(style="background-color: hsl(100, 100%, 50%)")
diff --git a/services/web/public/coffee/ide/track-changes/controllers/TrackChangesListController.coffee b/services/web/public/coffee/ide/track-changes/controllers/TrackChangesListController.coffee
index 9aa050199a..e716959a19 100644
--- a/services/web/public/coffee/ide/track-changes/controllers/TrackChangesListController.coffee
+++ b/services/web/public/coffee/ide/track-changes/controllers/TrackChangesListController.coffee
@@ -105,10 +105,13 @@ define [
 
 		$scope.displayName = (user) ->
 			full_name = "#{user.first_name} #{user.last_name}"
-			if full_name != " "
+			fallback_name = "Unknown"
+			if !user?
+				fallback_name
+			else if full_name != " "
 				full_name
 			else if user.email
 				user.email
 			else
-				"Unknown"
+				fallback_name
 	]