diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
index b80dd29cec2..ee49a1c119e 100644
--- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6
@@ -24,9 +24,13 @@ export default Ember.Controller.extend(CanCheckEmails, {
     'model.can_disable_second_factor'
   ),
 
-  automaticGroups: function() {
-    return this.get("model.automaticGroups").map((g) => g.name).join(", ");
-  }.property("model.automaticGroups"),
+  @computed("model.automaticGroups")
+  automaticGroups(automaticGroups) {
+    return automaticGroups.map(group => {
+      const name = Ember.String.htmlSafe(group.name);
+      return `<a href="/groups/${name}">${name}</a>`;
+    }).join(", ");
+  },
 
   userFields: function() {
     const siteUserFields = this.site.get('user_fields'),
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index 464402a8225..b1e164a01b5 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -415,7 +415,7 @@
     <h1>{{i18n 'admin.groups.title'}}</h1>
       <div class='display-row'>
         <div class='field'>{{i18n 'admin.groups.automatic'}}</div>
-        <div class='value'>{{automaticGroups}}</div>
+        <div class='value'>{{{automaticGroups}}}</div>
       </div>
       <div class='display-row'>
         <div class='field'>{{i18n 'admin.groups.custom'}}</div>