diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
index f16151ed29e..2ee95299a18 100644
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6
@@ -39,7 +39,7 @@ export default Ember.Controller.extend({
       if (this.get("showingLast")) { return; }
 
       const group = this.get("model"),
-            offset = Math.min(group.get("offset") + group.get("model.limit"), group.get("user_count"));
+            offset = Math.min(group.get("offset") + group.get("limit"), group.get("user_count"));
 
       group.set("offset", offset);
 
@@ -50,7 +50,7 @@ export default Ember.Controller.extend({
       if (this.get("showingFirst")) { return; }
 
       const group = this.get("model"),
-            offset = Math.max(group.get("offset") - group.get("model.limit"), 0);
+            offset = Math.max(group.get("offset") - group.get("limit"), 0);
 
       group.set("offset", offset);
 
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 3da80d9af7d..ac1f979691c 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -13,9 +13,9 @@
     <div>
       <label>{{i18n 'admin.groups.group_members'}} ({{model.user_count}})</label>
       <div>
-        <a {{bind-attr class=":previous showingFirst:disabled"}} {{action "previous"}}>{{fa-icon "fast-backward"}}</a>
+        <a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{fa-icon "fast-backward"}}</a>
         {{currentPage}}/{{totalPages}}
-        <a {{bind-attr class=":next showingLast:disabled"}} {{action "next"}}>{{fa-icon "fast-forward"}}</a>
+        <a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{fa-icon "fast-forward"}}</a>
       </div>
       <div class="ac-wrap clearfix">
         {{#each model.members as |member|}}
@@ -28,7 +28,7 @@
       <div>
         <label for="user-selector">{{i18n 'admin.groups.add_members'}}</label>
         {{user-selector usernames=model.usernames placeholderKey="admin.groups.selector_placeholder" id="user-selector"}}
-        <button {{action "addMembers"}} class='btn add'>{{fa-icon "plus"}} {{i18n 'admin.groups.add'}}</button>
+        {{d-button action="addMembers" class="add" icon="plus" label="admin.groups.add"}}
       </div>
     {{/unless}}
   {{/if}}