diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 775e0522f..c39324fd7 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -6,7 +6,7 @@
                 <h4 class="modal-title">Add User</h4>
             </div>
             <div class="modal-body">
-                <form name="useradd_form" role="form" ng-submit="doAdd()" autocomplete="off">
+                <form name="useradd_form" role="form" ng-submit="useradd.submit()" autocomplete="off">
                     <input type="password" style="display: none;">
                     <div class="form-group" ng-class="{ 'has-error': (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email) }">
                         <label class="control-label">Email</label>
@@ -46,7 +46,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-success" ng-click="doAdd()" ng-disabled="useradd_form.$invalid || useradd.busy"><i class="fa fa-spinner fa-pulse" ng-show="useradd.busy"></i> Add User</button>
+                <button type="button" class="btn btn-success" ng-click="useradd.submit()" ng-disabled="useradd_form.$invalid || useradd.busy"><i class="fa fa-spinner fa-pulse" ng-show="useradd.busy"></i> Add User</button>
             </div>
         </div>
     </div>
@@ -276,7 +276,7 @@
     <div>
         <div class="text-left">
             <h1>
-                Users <sup style="font-size: 14px;" ng-show="mailConfig.enabled"><a href="" ng-click="showUserHelp()"><i class="fa fa-question-circle"></i></a></sup> <button class="btn btn-primary btn-outline pull-right" ng-click="showUserAdd()"><i class="fa fa-user-plus"></i> New User</button>
+                Users <sup style="font-size: 14px;" ng-show="mailConfig.enabled"><a href="" ng-click="showUserHelp()"><i class="fa fa-question-circle"></i></a></sup> <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()"><i class="fa fa-user-plus"></i> New User</button>
             </h1>
         </div>
     </div>
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 654dc032c..28bc2ae42 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -25,7 +25,77 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         email: '',
         username: '',
         displayName: '',
-        sendInvite: true
+        sendInvite: true,
+
+        show: function () {
+            $scope.useradd.error = {};
+            $scope.useradd.email = '';
+            $scope.useradd.username = '';
+            $scope.useradd.displayName = '';
+
+            $scope.useradd_form.$setUntouched();
+            $scope.useradd_form.$setPristine();
+
+            $('#userAddModal').modal('show');
+        },
+
+        submit: function () {
+            $scope.useradd.busy = true;
+
+            $scope.useradd.alreadyTaken = false;
+            $scope.useradd.error.email = null;
+            $scope.useradd.error.username = null;
+            $scope.useradd.error.displayName = null;
+
+            Client.createUser($scope.useradd.username, $scope.useradd.email, $scope.useradd.displayName, $scope.useradd.sendInvite, function (error) {
+                $scope.useradd.busy = false;
+
+                if (error && error.statusCode === 409) {
+                    if (error.message.toLowerCase().indexOf('email') !== -1) {
+                        $scope.useradd.error.email = 'Email already taken';
+                        $scope.useradd_form.email.$setPristine();
+                        $('#inputUserAddEmail').focus();
+                        return;
+                    } else if (error.message.toLowerCase().indexOf('username') !== -1) {
+                        $scope.useradd.error.username = 'Username already taken';
+                        $scope.useradd_form.username.$setPristine();
+                        $('#inputUserAddUsername').focus();
+                    } else {
+                        // should not happen!!
+                        console.error(error.message);
+                        return;
+                    }
+                }
+                if (error && error.statusCode === 400) {
+                    if (error.message.indexOf('email') !== -1) {
+                        $scope.useradd.error.email = 'Invalid Email';
+                        $scope.useradd.error.emailAttempted = $scope.useradd.email;
+                        $scope.useradd_form.email.$setPristine();
+                        $('#inputUserAddEmail').focus();
+                    } else if (error.message.indexOf('username') !== -1) {
+                        $scope.useradd.error.username = 'Invalid Username';
+                        $scope.useradd_form.username.$setPristine();
+                        $('#inputUserAddUsername').focus();
+                    } else {
+                        console.error('Unable to create user.', error.statusCode, error.message);
+                    }
+                    return;
+                }
+                if (error) return console.error('Unable to create user.', error.statusCode, error.message);
+
+                $scope.useradd.error = {};
+                $scope.useradd.email = '';
+                $scope.useradd.username = '';
+                $scope.useradd.displayName = '';
+
+                $scope.useradd_form.$setUntouched();
+                $scope.useradd_form.$setPristine();
+
+                refresh();
+
+                $('#userAddModal').modal('hide');
+            });
+        }
     };
 
     $scope.useredit = {
@@ -165,76 +235,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         });
     };
 
-    $scope.showUserAdd = function () {
-        $scope.useradd.error = {};
-        $scope.useradd.email = '';
-        $scope.useradd.username = '';
-        $scope.useradd.displayName = '';
-
-        $scope.useradd_form.$setUntouched();
-        $scope.useradd_form.$setPristine();
-
-        $('#userAddModal').modal('show');
-    };
-
-    $scope.doAdd = function () {
-        $scope.useradd.busy = true;
-
-        $scope.useradd.alreadyTaken = false;
-        $scope.useradd.error.email = null;
-        $scope.useradd.error.username = null;
-        $scope.useradd.error.displayName = null;
-
-        Client.createUser($scope.useradd.username, $scope.useradd.email, $scope.useradd.displayName, $scope.useradd.sendInvite, function (error) {
-            $scope.useradd.busy = false;
-
-            if (error && error.statusCode === 409) {
-                if (error.message.toLowerCase().indexOf('email') !== -1) {
-                    $scope.useradd.error.email = 'Email already taken';
-                    $scope.useradd_form.email.$setPristine();
-                    $('#inputUserAddEmail').focus();
-                    return;
-                } else if (error.message.toLowerCase().indexOf('username') !== -1) {
-                    $scope.useradd.error.username = 'Username already taken';
-                    $scope.useradd_form.username.$setPristine();
-                    $('#inputUserAddUsername').focus();
-                } else {
-                    // should not happen!!
-                    console.error(error.message);
-                    return;
-                }
-            }
-            if (error && error.statusCode === 400) {
-                if (error.message.indexOf('email') !== -1) {
-                    $scope.useradd.error.email = 'Invalid Email';
-                    $scope.useradd.error.emailAttempted = $scope.useradd.email;
-                    $scope.useradd_form.email.$setPristine();
-                    $('#inputUserAddEmail').focus();
-                } else if (error.message.indexOf('username') !== -1) {
-                    $scope.useradd.error.username = 'Invalid Username';
-                    $scope.useradd_form.username.$setPristine();
-                    $('#inputUserAddUsername').focus();
-                } else {
-                    console.error('Unable to create user.', error.statusCode, error.message);
-                }
-                return;
-            }
-            if (error) return console.error('Unable to create user.', error.statusCode, error.message);
-
-            $scope.useradd.error = {};
-            $scope.useradd.email = '';
-            $scope.useradd.username = '';
-            $scope.useradd.displayName = '';
-
-            $scope.useradd_form.$setUntouched();
-            $scope.useradd_form.$setPristine();
-
-            refresh();
-
-            $('#userAddModal').modal('hide');
-        });
-    };
-
     $scope.showUserEdit = function (userInfo) {
         $scope.useredit.error.email = null;
         $scope.useredit.email = userInfo.alternateEmail || userInfo.email;