diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index c39324fd7..13dbc5cb3 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -60,7 +60,7 @@
                 <h4 class="modal-title">Delete user {{ userremove.userInfo.username }}</h4>
             </div>
             <div class="modal-body">
-                <form name="userremove_form" role="form" ng-submit="doUserRemove()" autocomplete="off">
+                <form name="userremove_form" role="form" ng-submit="userremove.submit()" autocomplete="off">
                     <input type="password" style="display: none;">
                     <div class="form-group" ng-class="{ 'has-error': (userremove_form.username.$dirty && userremove_form.username.$invalid) || (!userremove_form.username.$dirty && userremove.error.username) }">
                         <label class="control-label">Just to be sure you really want to delete this user, please type the username or email</label>
@@ -83,7 +83,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-danger" ng-click="doUserRemove()" ng-disabled="userremove_form.$invalid || userremove.busy"><i class="fa fa-spinner fa-pulse" ng-show="userremove.busy"></i> Delete</button>
+                <button type="button" class="btn btn-danger" ng-click="userremove.submit()" ng-disabled="userremove_form.$invalid || userremove.busy"><i class="fa fa-spinner fa-pulse" ng-show="userremove.busy"></i> Delete</button>
             </div>
         </div>
     </div>
@@ -316,7 +316,7 @@
                                 <td class="text-right no-wrap" style="vertical-align: bottom">
                                     <button ng-show="!isMe(user)" class="btn btn-xs btn-default" ng-click="sendInvite(user)" title="Send Invite"><i class="fa fa-paper-plane-o"></i></button>
                                     <button class="btn btn-xs btn-default" ng-click="showUserEdit(user)" title="Edit User Profile"><i class="fa fa-pencil"></i></button>
-                                    <button ng-show="!isMe(user)" 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)" class="btn btn-xs btn-danger" ng-click="userremove.show(user)" title="Remove User"><i class="fa fa-trash-o"></i></button>
                                 </td>
                             </tr>
                         </tbody>
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 28bc2ae42..e69006e14 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -15,7 +15,59 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         error: {},
         userInfo: {},
         username: '',
-        password: ''
+        password: '',
+
+        show: function (userInfo) {
+            $scope.userremove.error.username = null;
+            $scope.userremove.error.password = null;
+            $scope.userremove.username = '';
+            $scope.userremove.password = '';
+            $scope.userremove.userInfo = userInfo;
+
+            $scope.userremove_form.$setPristine();
+            $scope.userremove_form.$setUntouched();
+
+            $('#userRemoveModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.userremove.error.username = null;
+            $scope.userremove.error.password = null;
+
+            if ($scope.userremove.username !== $scope.userremove.userInfo.username && $scope.userremove.username !== $scope.userremove.userInfo.email && $scope.userremove.username !== $scope.userremove.userInfo.alternateEmail) {
+                $scope.userremove.error.username = true;
+                $scope.userremove.username = '';
+                $scope.userremove_form.username.$setPristine();
+                $('#inputUserRemoveUsername').focus();
+                return;
+            }
+
+            $scope.userremove.busy = true;
+
+            Client.removeUser($scope.userremove.userInfo.id, $scope.userremove.password, function (error) {
+                $scope.userremove.busy = false;
+
+                if (error && error.statusCode === 403) {
+                    $scope.userremove.error.password = 'Wrong password';
+                    $scope.userremove.password = '';
+                    $scope.userremove_form.password.$setPristine();
+                    $('#inputUserRemovePassword').focus();
+                    return;
+                }
+                if (error) return console.error('Unable to delete user.', error);
+
+                $scope.userremove.userInfo = {};
+                $scope.userremove.username = '';
+                $scope.userremove.password = '';
+
+                $scope.userremove_form.$setPristine();
+                $scope.userremove_form.$setUntouched();
+
+                refresh();
+
+                $('#userRemoveModal').modal('hide');
+            });
+        }
     };
 
     $scope.useradd = {
@@ -326,58 +378,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         });
     };
 
-    $scope.showUserRemove = function (userInfo) {
-        $scope.userremove.error.username = null;
-        $scope.userremove.error.password = null;
-        $scope.userremove.username = '';
-        $scope.userremove.password = '';
-        $scope.userremove.userInfo = userInfo;
-
-        $scope.userremove_form.$setPristine();
-        $scope.userremove_form.$setUntouched();
-
-        $('#userRemoveModal').modal('show');
-    };
-
-    $scope.doUserRemove = function () {
-        $scope.userremove.error.username = null;
-        $scope.userremove.error.password = null;
-
-        if ($scope.userremove.username !== $scope.userremove.userInfo.username && $scope.userremove.username !== $scope.userremove.userInfo.email && $scope.userremove.username !== $scope.userremove.userInfo.alternateEmail) {
-            $scope.userremove.error.username = true;
-            $scope.userremove.username = '';
-            $scope.userremove_form.username.$setPristine();
-            $('#inputUserRemoveUsername').focus();
-            return;
-        }
-
-        $scope.userremove.busy = true;
-
-        Client.removeUser($scope.userremove.userInfo.id, $scope.userremove.password, function (error) {
-            $scope.userremove.busy = false;
-
-            if (error && error.statusCode === 403) {
-                $scope.userremove.error.password = 'Wrong password';
-                $scope.userremove.password = '';
-                $scope.userremove_form.password.$setPristine();
-                $('#inputUserRemovePassword').focus();
-                return;
-            }
-            if (error) return console.error('Unable to delete user.', error);
-
-            $scope.userremove.userInfo = {};
-            $scope.userremove.username = '';
-            $scope.userremove.password = '';
-
-            $scope.userremove_form.$setPristine();
-            $scope.userremove_form.$setUntouched();
-
-            refresh();
-
-            $('#userRemoveModal').modal('hide');
-        });
-    };
-
     $scope.showUserHelp = function () {
         $('#userHelpModal').modal('show');
     };