diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js
index cad5226dfa6..493ec58d19f 100644
--- a/app/assets/javascripts/admin/models/admin_user.js
+++ b/app/assets/javascripts/admin/models/admin_user.js
@@ -359,9 +359,15 @@ Discourse.AdminUser = Discourse.User.extend({
 
   suspendedBy: function() {
     if (this.get('suspended_by')) {
-      return Discourse.User.create(this.get('suspended_by'));
+      return Discourse.AdminUser.create(this.get('suspended_by'));
     }
-  }.property('suspended_by')
+  }.property('suspended_by'),
+
+  approvedBy: function() {
+    if (this.get('approved_by')) {
+      return Discourse.AdminUser.create(this.get('approved_by'));
+    }
+  }.property('approved_by')
 
 });
 
diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index 860fa8f6da5..ba49ae05281 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -102,8 +102,8 @@
         {{#if approved}}
           {{i18n admin.user.approved_by}}
 
-          {{#link-to 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/link-to}}
-          {{#link-to 'adminUser' approved_by}}{{approved_by.username}}{{/link-to}}
+          {{#link-to 'adminUser' approvedBy}}{{avatar approvedBy imageSize="small"}}{{/link-to}}
+          {{#link-to 'adminUser' approvedBy}}{{approvedBy.username}}{{/link-to}}
         {{else}}
           {{i18n no_value}}
         {{/if}}
@@ -260,7 +260,6 @@
   <div class='display-row highlight-danger'>
     <div class='field'>{{i18n admin.user.suspended_by}}</div>
     <div class='value'>
-      <!-- TODO: Why don't these links work? -->
       {{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}}
       {{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}}
     </div>