diff --git a/src/main/twirl/account/group.scala.html b/src/main/twirl/account/group.scala.html
index de23a6a..7afdbc3 100644
--- a/src/main/twirl/account/group.scala.html
+++ b/src/main/twirl/account/group.scala.html
@@ -107,11 +107,11 @@
   }
 
   function addMemberHTML(userName, isManager){
-    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').addClass('is_manager_' + userName);
+    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').data('name', userName);
     if(!isManager){
       memberButton.addClass('active');
     }
-    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').addClass('is_manager_' + userName);
+    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').data('name', userName);
     if(isManager){
       managerButton.addClass('active');
     }
@@ -130,7 +130,9 @@
   function updateMembers(){
     var members = $('#member-list li').map(function(i, e){
       var userName = $(e).data('name');
-      return userName + ':' + $('.is_manager_' + userName + '.active').attr('value');
+      return userName + ':' + $('button.active').filter(function(i, e){
+        return $(e).data('name') == userName;
+      }).attr('value');
     }).get().join(',');
     $('#members').val(members);
   }
diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html
index 2f75cd0..5661d8e 100644
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -102,11 +102,11 @@
   }
 
   function addMemberHTML(userName, isManager){
-    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').addClass('is_manager_' + userName);
+    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').data('name', userName);
     if(!isManager){
       memberButton.addClass('active');
     }
-    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').addClass('is_manager_' + userName);
+    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').data('name', userName);
     if(isManager){
       managerButton.addClass('active');
     }
@@ -125,7 +125,9 @@
   function updateMembers(){
     var members = $('#member-list li').map(function(i, e){
       var userName = $(e).data('name');
-      return userName + ':' + $('.is_manager_' + userName + '.active').attr('value');
+      return userName + ':' + $('button.active').filter(function(i, e){
+        return $(e).data('name') == userName;
+      }).attr('value');
     }).get().join(',');
     $('#members').val(members);
   }