diff --git a/app/assets/javascripts/admin/templates/groups_type.hbs b/app/assets/javascripts/admin/templates/groups_type.hbs
index 980ca08c8f6..3c4fc3e5061 100644
--- a/app/assets/javascripts/admin/templates/groups_type.hbs
+++ b/app/assets/javascripts/admin/templates/groups_type.hbs
@@ -4,7 +4,11 @@
     <ul>
       {{#each group in controller}}
         <li>
-          {{#link-to "adminGroup" group.type group.name}}{{group.name}} <span class="count">{{group.userCountDisplay}}</span>{{/link-to}}
+          {{#link-to "adminGroup" group.type group.name}}{{group.name}}
+            {{#if group.userCountDisplay}}
+              <span class="count">{{group.userCountDisplay}}</span>
+            {{/if}}
+          {{/link-to}}
         </li>
       {{/each}}
     </ul>
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index d0048cc9577..a34c6dccae5 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -17,11 +17,11 @@ const Group = Discourse.Model.extend({
     return this.get("automatic") ? "automatic" : "custom";
   }.property("automatic"),
 
-  userCountDisplay: function(){
-    var c = this.get('user_count');
+  @computed('user_count')
+  userCountDisplay(userCount) {
     // don't display zero its ugly
-    if (c > 0) { return c; }
-  }.property('user_count'),
+    if (userCount > 0) { return userCount; }
+  },
 
   findMembers() {
     if (Em.isEmpty(this.get('name'))) { return ; }