diff --git a/services/web/app/views/project/editor/chat.jade b/services/web/app/views/project/editor/chat.jade
index 668f5acb68..33ba4b3483 100644
--- a/services/web/app/views/project/editor/chat.jade
+++ b/services/web/app/views/project/editor/chat.jade
@@ -31,7 +31,9 @@ aside.chat(
 					span.avatar
 						img(ng-src="{{message.user.gravatar_url}}?d=mm&s=50")
 					div.message-wrapper
-						.name(ng-if="message.user.id != user.id") {{ message.user.first_name }}
+						.name(ng-if="message.user.id != user.id")
+							span(ng-if="message.user.first_name") {{ message.user.first_name }}
+							span(ng-if="!message.user.first_name") {{ message.user.email }}
 						.message(
 							ng-style="{\
 								'border-color': 'hsl({{ hue(message.user) }}, 70%, 70%)',\
diff --git a/services/web/public/stylesheets/app/editor/chat.less b/services/web/public/stylesheets/app/editor/chat.less
index 90cdf30e46..495ac6dce0 100644
--- a/services/web/public/stylesheets/app/editor/chat.less
+++ b/services/web/public/stylesheets/app/editor/chat.less
@@ -51,6 +51,7 @@
 					font-size: 12px;
 					color: @gray-light;
 					margin-bottom: 4px;
+					min-height: 16px;
 				}
 				.message {
 					padding: @line-height-computed / 2;