diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index e77699ef9..9660d1bf3 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -18,6 +18,25 @@
                         <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>
+                        <p>If not specified, the user can choose the username following the invite link.</p>
+                        <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">This is not a valid username</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">
+                    </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">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.displayName">This is not a valid displayName</small>
+                            <small ng-show="!useradd_form.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
+                        </div>
+                        <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName">
+                    </div>
+
                     <div class="checkbox">
                         <label>
                             <input type="checkbox" ng-model="useradd.sendInvite" id="inputUserAddSendInvite"> Send invite
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index be3f53abf..efefcd32f 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -23,6 +23,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         alreadyTaken: false,
         error: {},
         email: '',
+        username: '',
+        displayName: '',
         sendInvite: true
     };
 
@@ -166,6 +168,8 @@ 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();
@@ -178,8 +182,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
         $scope.useradd.alreadyTaken = false;
         $scope.useradd.error.email = null;
+        $scope.useradd.error.username = null;
+        $scope.useradd.error.displayName = null;
 
-        Client.createUser('' /* username */, $scope.useradd.email, '' /* displayName */, $scope.useradd.sendInvite, function (error) {
+        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) {
@@ -203,6 +209,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
 
             $scope.useradd.error = {};
             $scope.useradd.email = '';
+            $scope.useradd.username = '';
+            $scope.useradd.displayName = '';
 
             $scope.useradd_form.$setUntouched();
             $scope.useradd_form.$setPristine();