diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade
index e1de66e44e..7feae8d0fe 100644
--- a/services/web/app/views/project/editor/editor.jade
+++ b/services/web/app/views/project/editor/editor.jade
@@ -56,13 +56,15 @@ div.full-size(
 						ng-style="{'top': top}"
 					)
 						div(ng-if="entry.type == 'insert' || entry.type == 'delete'")
+							div(style="float: right; background-color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%); width: 40px; height: 40px;") {{ users[entry.metadata.user_id].avatar_text }}
+							div.small(style="color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%)") {{ users[entry.metadata.user_id].name }}
 							div.small {{ entry.metadata.ts }}
-							{{ entry.content }}
+							| {{ entry.content }}
 						div(ng-if="entry.type == 'comment'")
 							div(ng-repeat="comment in entry.thread", class="comment-thread__comment")
 								div.small {{ comment.ts }}
 								div.small {{ comment.user_id }}
-								{{ comment.content }}
+								| {{ comment.content }}
 							div(ng-if="entry.replying")
 								textarea(ng-model="entry.replyContent")
 								a.btn.btn-sm.btn-primary(href, ng-click="submitReply(entry)") Submit
diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index 1e9684e588..344d34f370 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -1,7 +1,8 @@
 define [
 	"base",
 	"utils/EventEmitter"
-], (App, EventEmitter) ->
+	"ide/colors/ColorManager"
+], (App, EventEmitter, ColorManager) ->
 	App.controller "ReviewPanelController", ($scope, $element, ide) ->
 		$scope.reviewPanel =
 			entries: {}
@@ -92,4 +93,19 @@ define [
 		$scope.cancelReply = (entry) ->
 			entry.replying = false
 			entry.replyContent = ""
-			$scope.$broadcast "review-panel:layout"
\ No newline at end of file
+			$scope.$broadcast "review-panel:layout"
+		
+		refreshUsers = () ->
+			$scope.users = {}
+			for member in $scope.project.members.concat($scope.project.owner)
+				$scope.users[member._id] = {
+					email: member.email
+					name: "#{member.first_name} #{member.last_name}"
+					hue: ColorManager.getHueForUserId(member._id)
+					avatar_text: [member.first_name, member.last_name].filter((n) -> n?).map((n) -> n[0]).join ""
+				}
+			console.log "REFRESHED USERS", $scope.project.members, $scope.users
+		
+		$scope.$watch "project.members", (members) ->
+			return if !members?
+			refreshUsers()