diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 5276b99fb..5c2dbdb4b 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -8,16 +8,6 @@
             <div class="modal-body">
                 <form name="useradd_form" role="form" ng-submit="doAdd()" autocomplete="off">
                     <input type="password" style="display: none;">
-                    <div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
-                        <label class="control-label">Username</label>
-                        <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.required">A username is required</small>
-                            <small ng-show="useradd_form.username.$error.minlength">The username is too short</small>
-                            <small ng-show="useradd_form.username.$error.maxlength">The username is too long</small>
-                            <small ng-show="!useradd_form.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
-                        </div>
-                        <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-maxlength="512" ng-minlength="3" required autofocus>
-                    </div>
                     <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>
                         <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)">
@@ -25,11 +15,22 @@
                             <small ng-show="useradd_form.email.$error.email">This is not a valid email</small>
                             <small ng-show="!useradd_form.email.$dirty && useradd.error.email">{{ useradd.error.email }}</small>
                         </div>
-                        <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
+                        <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required autofocus>
+                    </div>
+
+                    <div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username) }">
+                        <label class="control-label">Username (optional)</label>
+                        <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.required">A username is required</small>
+                            <small ng-show="useradd_form.username.$error.minlength">The username is too short</small>
+                            <small ng-show="useradd_form.username.$error.maxlength">The username is too long</small>
+                            <small ng-show="!useradd_form.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
+                        </div>
+                        <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-maxlength="512" ng-minlength="3">
                     </div>
 
                     <div class="form-group" ng-class="{ 'has-error': (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName) }">
-                        <label class="control-label">Full Name</label>
+                        <label class="control-label">Display Name (optional)</label>
                         <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.required">A Name is required</small>
                             <small ng-show="useradd_form.displayName.$error.displayName">This is not a valid Name</small>