diff --git a/app/assets/javascripts/discourse/models/user_action.js b/app/assets/javascripts/discourse/models/user_action.js
index c5c084e7163..0d0a2c2bc21 100644
--- a/app/assets/javascripts/discourse/models/user_action.js
+++ b/app/assets/javascripts/discourse/models/user_action.js
@@ -81,7 +81,7 @@ Discourse.UserAction = Discourse.Model.extend({
       replyUrl: this.get('replyUrl'),
       postUrl: this.get('postUrl'),
       topicUrl: this.get('replyUrl'),
-      user: this.get('name'),
+      user: this.get('presentName'),
       post_number: '#' + this.get('reply_to_post_number'),
       user1Url: this.get('userUrl'),
       user2Url: this.get('targetUserUrl'),
@@ -98,6 +98,8 @@ Discourse.UserAction = Discourse.Model.extend({
     return this.get('target_username') === Discourse.User.currentProp('username');
   }.property('target_username'),
 
+  presentName: Em.computed.any('name', 'username'),
+
   targetUserUrl: Discourse.computed.url('target_username', '/users/%@'),
   usernameLower: function() {
     return this.get('username').toLowerCase();