diff --git a/src/views/users.html b/src/views/users.html
index eab900296..276b95508 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -42,43 +42,43 @@
         <h4 class="modal-title">{{ 'users.addUserDialog.title' | tr }}</h4>
       </div>
       <div class="modal-body">
-        <form name="useradd_form" role="form" ng-submit="useradd.submit()" autocomplete="off">
-          <div class="form-group" ng-class="{ 'has-error': (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName) }">
+        <form name="useraddForm" role="form" ng-submit="useradd.submit()" autocomplete="off">
+          <div class="form-group" ng-class="{ 'has-error': (useraddForm.displayName.$dirty && useraddForm.displayName.$invalid) || (!useraddForm.displayName.$dirty && useradd.error.displayName) }">
             <label class="control-label">{{ 'users.user.fullName' | tr }}</label>
             <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" autofocus autocomplete="off" placeholder="{{ 'users.user.displayNamePlaceholder' | tr }}">
-            <div class="control-label" ng-show="(!useradd_form.displayName.$dirty && useradd.error.displayName) || (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName)">
-              <small ng-show="useradd_form.displayName.$error.displayName">{{ 'users.user.errorNotValidFullName' | tr }}</small>
-              <small ng-show="!useradd_form.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
+            <div class="control-label" ng-show="(!useraddForm.displayName.$dirty && useradd.error.displayName) || (useraddForm.displayName.$dirty && useraddForm.displayName.$invalid) || (!useraddForm.displayName.$dirty && useradd.error.displayName)">
+              <small ng-show="useraddForm.displayName.$error.displayName">{{ 'users.user.errorNotValidFullName' | tr }}</small>
+              <small ng-show="!useraddForm.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
             </div>
           </div>
 
           <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) }">
+          <div class="form-group" ng-class="{ 'has-error': (useraddForm.email.$dirty && useraddForm.email.$invalid) || (!useraddForm.email.$dirty && useradd.error.email) }">
             <label class="control-label">{{ 'users.user.primaryEmail' | tr }}</label>
             <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
-            <div class="control-label" ng-show="(!useradd_form.email.$dirty && useradd.error.email) || (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email)">
-              <small ng-show="useradd_form.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
-              <small ng-show="useradd_form.email.$error.email">{{ 'users.user.errorInvalidEmail' | tr }}</small>
-              <small ng-show="!useradd_form.email.$dirty && useradd.error.email">{{ useradd.error.email }}</small>
+            <div class="control-label" ng-show="(!useraddForm.email.$dirty && useradd.error.email) || (useraddForm.email.$dirty && useraddForm.email.$invalid) || (!useraddForm.email.$dirty && useradd.error.email)">
+              <small ng-show="useraddForm.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
+              <small ng-show="useraddForm.email.$error.email">{{ 'users.user.errorInvalidEmail' | tr }}</small>
+              <small ng-show="!useraddForm.email.$dirty && useradd.error.email">{{ useradd.error.email }}</small>
             </div>
           </div>
 
-          <div class="form-group" ng-class="{ 'has-error': (useradd_form.fallbackEmail.$dirty && useradd_form.fallbackEmail.$invalid) || (!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail) }">
+          <div class="form-group" ng-class="{ 'has-error': (useraddForm.fallbackEmail.$dirty && useraddForm.fallbackEmail.$invalid) || (!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail) }">
             <label class="control-label">{{ 'users.user.recoveryEmail' | tr }}</label>
             <input type="email" class="form-control" ng-model="useradd.fallbackEmail" name="fallbackEmail" id="inputUserAddFallbackEmail" placeholder="{{ 'users.user.fallbackEmailPlaceholder' | tr }}">
-            <div class="control-label" ng-show="(!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail) || (useradd_form.fallbackEmail.$dirty && useradd_form.fallbackEmail.$invalid) || (!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail)">
-              <small ng-show="useradd_form.fallbackEmail.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
-              <small ng-show="useradd_form.fallbackEmail.$error.fallbackEmail">{{ 'users.user.errorInvalidEmail' | tr }}</small>
-              <small ng-show="!useradd_form.fallbackEmail.$dirty && useradd.error.fallbackEmail">{{ useradd.error.fallbackEmail }}</small>
+            <div class="control-label" ng-show="(!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail) || (useraddForm.fallbackEmail.$dirty && useraddForm.fallbackEmail.$invalid) || (!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail)">
+              <small ng-show="useraddForm.fallbackEmail.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
+              <small ng-show="useraddForm.fallbackEmail.$error.fallbackEmail">{{ 'users.user.errorInvalidEmail' | tr }}</small>
+              <small ng-show="!useraddForm.fallbackEmail.$dirty && useradd.error.fallbackEmail">{{ useradd.error.fallbackEmail }}</small>
             </div>
           </div>
 
-          <div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
+          <div class="form-group" ng-class="{ 'has-error': (useraddForm.username.$dirty && useraddForm.username.$invalid) || (!useraddForm.username.$dirty && useradd.error.username) }">
             <label class="control-label">{{ 'users.user.username' | tr }}</label>
             <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-required="config.profileLocked" placeholder="{{ config.profileLocked ? '' : ('users.user.usernamePlaceholder' | tr) }}">
-            <div class="control-label" ng-show="(!useradd_form.username.$dirty && useradd.error.username) || (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username)">
-              <small ng-show="useradd_form.username.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
-              <small ng-show="!useradd_form.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
+            <div class="control-label" ng-show="(!useraddForm.username.$dirty && useradd.error.username) || (useraddForm.username.$dirty && useraddForm.username.$invalid) || (!useraddForm.username.$dirty && useradd.error.username)">
+              <small ng-show="useraddForm.username.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
+              <small ng-show="!useraddForm.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
             </div>
           </div>
 
@@ -103,12 +103,12 @@
             </label>
           </div>
 
-          <input class="ng-hide" type="submit" ng-disabled="useradd_form.$invalid || useradd.busy"/>
+          <input class="ng-hide" type="submit" ng-disabled="useraddForm.$invalid || useradd.busy"/>
         </form>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
-        <button type="button" class="btn btn-success" ng-click="useradd.submit()" ng-disabled="useradd_form.$invalid || useradd.busy"><i class="fa fa-circle-notch fa-spin" ng-show="useradd.busy"></i> {{ 'users.addUserDialog.addUserAction' | tr }}</button>
+        <button type="button" class="btn btn-success" ng-click="useradd.submit()" ng-disabled="useraddForm.$invalid || useradd.busy"><i class="fa fa-circle-notch fa-spin" ng-show="useradd.busy"></i> {{ 'users.addUserDialog.addUserAction' | tr }}</button>
       </div>
     </div>
   </div>
diff --git a/src/views/users.js b/src/views/users.js
index 63edee20e..2120012ab 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -340,8 +340,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useradd.role = 'user';
             $scope.useradd.sendInvite = false;
 
-            $scope.useradd_form.$setUntouched();
-            $scope.useradd_form.$setPristine();
+            $scope.useraddForm.$setUntouched();
+            $scope.useraddForm.$setPristine();
 
             $('#userAddModal').modal('show');
         },
@@ -370,11 +370,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                     if (error.statusCode === 409) {
                         if (error.message.toLowerCase().indexOf('email') !== -1) {
                             $scope.useradd.error.email = 'Email already taken';
-                            $scope.useradd_form.email.$setPristine();
+                            $scope.useraddForm.email.$setPristine();
                             $('#inputUserAddEmail').focus();
                         } else if (error.message.toLowerCase().indexOf('username') !== -1 || error.message.toLowerCase().indexOf('mailbox') !== -1) {
                             $scope.useradd.error.username = 'Username already taken';
-                            $scope.useradd_form.username.$setPristine();
+                            $scope.useraddForm.username.$setPristine();
                             $('#inputUserAddUsername').focus();
                         } else {
                             // should not happen!!
@@ -385,11 +385,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                         if (error.message.toLowerCase().indexOf('email') !== -1) {
                             $scope.useradd.error.email = 'Invalid Email';
                             $scope.useradd.error.emailAttempted = $scope.useradd.email;
-                            $scope.useradd_form.email.$setPristine();
+                            $scope.useraddForm.email.$setPristine();
                             $('#inputUserAddEmail').focus();
                         } else if (error.message.toLowerCase().indexOf('username') !== -1) {
                             $scope.useradd.error.username = error.message;
-                            $scope.useradd_form.username.$setPristine();
+                            $scope.useraddForm.username.$setPristine();
                             $('#inputUserAddUsername').focus();
                         } else {
                             console.error('Unable to create user.', error.statusCode, error.message);