diff --git a/framework/core/ember/app/components/discussion/post-header/user.js b/framework/core/ember/app/components/discussion/post-header/user.js
index 627fc0435..aa09a96eb 100644
--- a/framework/core/ember/app/components/discussion/post-header/user.js
+++ b/framework/core/ember/app/components/discussion/post-header/user.js
@@ -8,5 +8,5 @@ var precompileTemplate = Ember.Handlebars.compile;
 export default Ember.Component.extend({
   tagName: 'h3',
   classNames: ['post-user'],
-  layout: precompileTemplate('{{#link-to "user" post.user}}{{user-avatar post.user}} {{post.user.username}}{{/link-to}}')
+  layout: precompileTemplate('{{#if post.user}}{{#link-to "user" post.user}}{{user-avatar post.user}} {{user-name post.user}}{{/link-to}}{{else}}{{user-avatar post.user}} {{user-name post.user}}{{/if}}')
 });
diff --git a/framework/core/ember/app/helpers/user-avatar.js b/framework/core/ember/app/helpers/user-avatar.js
index a989675b4..eb5ca54fb 100644
--- a/framework/core/ember/app/helpers/user-avatar.js
+++ b/framework/core/ember/app/helpers/user-avatar.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 
 export default Ember.Handlebars.makeBoundHelper(function(user, options) {
-  var attributes = 'class="avatar '+options.hash.class+'"';
+  var attributes = 'class="avatar '+(options.hash.class || '')+'"';
   var content = '';
 
   if (user) {
diff --git a/framework/core/ember/app/helpers/user-name.js b/framework/core/ember/app/helpers/user-name.js
new file mode 100644
index 000000000..7f426749e
--- /dev/null
+++ b/framework/core/ember/app/helpers/user-name.js
@@ -0,0 +1,12 @@
+import Ember from 'ember';
+
+export default Ember.Handlebars.makeBoundHelper(function(user, options) {
+  var username;
+  if (user) {
+    username = user.get('username');
+  }
+  username = username || '[deleted]';
+
+  return new Ember.Handlebars.SafeString('<span class="username">'+Ember.Handlebars.Utils.escapeExpression(username)+'</span>');
+});
+
diff --git a/framework/core/ember/app/styles/flarum/components.less b/framework/core/ember/app/styles/flarum/components.less
index 74d69b6f0..117641e86 100644
--- a/framework/core/ember/app/styles/flarum/components.less
+++ b/framework/core/ember/app/styles/flarum/components.less
@@ -234,6 +234,7 @@
   font-weight: 300;
   text-align: center;
   vertical-align: top;
+  background-color: @fl-body-control-bg;
   .avatar-size(48px);
 
   & img {
diff --git a/framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs b/framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs
index ddb7cedf3..3145a0f3e 100644
--- a/framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs
+++ b/framework/core/ember/app/templates/components/index/discussion-info/terminal-post.hbs
@@ -1,7 +1,7 @@
 {{#if displayLastPost}}
-  <span class="username">{{discussion.lastUser.username}}</span> replied
-  <span class="time">{{human-time discussion.lastTime}}</span>
+  {{user-name discussion.lastUser}} replied
+  {{human-time discussion.lastTime}}
 {{else}}
-  <span class="username">{{discussion.startUser.username}}</span> started
-  <span class="time">{{human-time discussion.startTime}}</span>
+  {{user-name discussion.startUser}} started
+  {{human-time discussion.startTime}}
 {{/if}}