diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 91666f9db..c6a9947c5 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -174,19 +174,16 @@
                                 <td class="text-overflow: ellipsis; white-space: nowrap;">
                                     {{ user.username }}
                                     <span class="text-muted">{{ user.email }}</span>
+                                    <span ng-show="isMe(user)" class="label label-success">This is you!</span>
                                 </td>
                                 <td class="text-right" style="vertical-align: bottom">
                                     <span ng-show="isAdmin(user)" class="label label-default">Admin</span>
                                 </td>
                                 <td class="text-right" style="vertical-align: bottom">
-                                    <span ng-show="isMe(user)" class="label label-success">This is you!</span>
-                                    <button ng-show="!isMe(user) && userInfo.admin" ng-click="toggleAdmin(user)" class="btn btn-xs btn-default" title="{{ user.admin ? 'Remove Admin Privileges' : 'Make User an Admin' }}">
-                                        <span ng-show="!user.admin"><i class="fa fa-plus"></i> Admin</span>
-                                        <span ng-show="user.admin"><i class="fa fa-minus"></i> Admin</span>
-                                    </button>
-                                    <button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-default" ng-click="sendInvite(user)" title="Send Invite"><i class="fa fa-paper-plane-o"></i> Invite</button>
-                                    <button ng-show="isMe(user) || userInfo.admin" class="btn btn-xs btn-default" ng-click="showUserEdit(user)" title="Edit User Profile"><i class="fa fa-pencil"></i> Edit</button>
-                                    <button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-danger" ng-click="showUserRemove(user)" title="Remove User"><i class="fa fa-trash-o"></i> Delete</button>
+                                    <button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-danger" ng-click="showUserRemove(user)" title="Remove User"><i class="fa fa-trash-o"></i></button>
+                                    <button ng-show="!isMe(user) && userInfo.admin" class="btn btn-xs btn-default" ng-click="sendInvite(user)" title="Send Invite"><i class="fa fa-paper-plane-o"></i></button>
+                                    <button ng-show="userInfo.admin" class="btn btn-xs btn-default" ng-click="manageUserGroups(user)" title="Manage Groups"><i class="fa fa-group"></i></button>
+                                    <button ng-show="userInfo.admin" class="btn btn-xs btn-default" ng-click="showUserEdit(user)" title="Edit User Profile"><i class="fa fa-pencil"></i></button>
                                 </td>
                             </tr>
                         </tbody>