diff --git a/app/assets/javascripts/discourse/components/actions-summary.js.es6 b/app/assets/javascripts/discourse/components/actions-summary.js.es6
index 55e404f0adb..533438852cf 100644
--- a/app/assets/javascripts/discourse/components/actions-summary.js.es6
+++ b/app/assets/javascripts/discourse/components/actions-summary.js.es6
@@ -38,7 +38,7 @@ export default Ember.Component.extend(StringBuffer, {
         if (users.length) {
           let postUrl;
           users.forEach(function(u) {
-            const username = u.get('username_lower');
+            const username = u.get('username');
 
             iconsHtml += `<a href="${Discourse.getURL("/users")}${username}" data-user-card="${username}">`;
             if (u.post_url) {
diff --git a/app/assets/javascripts/discourse/components/user-link.js.es6 b/app/assets/javascripts/discourse/components/user-link.js.es6
index 4c1665fd2ac..b50aeafae0c 100644
--- a/app/assets/javascripts/discourse/components/user-link.js.es6
+++ b/app/assets/javascripts/discourse/components/user-link.js.es6
@@ -2,5 +2,5 @@ export default Ember.Component.extend({
   tagName: 'a',
   attributeBindings: ['href', 'data-user-card'],
   href: Ember.computed.alias('user.path'),
-  'data-user-card': Ember.computed.alias('user.username_lower')
+  'data-user-card': Ember.computed.alias('user.username')
 });
diff --git a/app/assets/javascripts/discourse/components/who-liked.js.es6 b/app/assets/javascripts/discourse/components/who-liked.js.es6
index 3d34e9afc13..412dfecdeb0 100644
--- a/app/assets/javascripts/discourse/components/who-liked.js.es6
+++ b/app/assets/javascripts/discourse/components/who-liked.js.es6
@@ -9,7 +9,7 @@ export default Ember.Component.extend(StringBuffer, {
       buffer.push("<div class='who-liked'>");
       let iconsHtml = "";
       users.forEach(function(u) {
-        iconsHtml += "<a href=\"" + Discourse.getURL("/users/") + u.get('username_lower') + "\" data-user-card=\"" + u.get('username_lower') + "\">";
+        iconsHtml += "<a href=\"" + Discourse.getURL("/users/") + u.get('username_lower') + "\" data-user-card=\"" + u.get('username') + "\">";
         iconsHtml += Discourse.Utilities.avatarImg({
           size: 'small',
           avatarTemplate: u.get('avatar_template'),
diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
index 716f6078ee0..64677ca6310 100644
--- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
@@ -9,8 +9,6 @@
     <div class='user'>
       {{#user-link user=au}}
         {{avatar au imageSize="small"}}
-      {{/user-link}}
-      {{#user-link user=au}}
         {{unbound au.username}}
       {{/user-link}}
       {{#if details.can_remove_allowed_users}}