diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 8d756dad0..4b6b1920f 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -189,10 +189,20 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useradd.busy = false;
 
             if (error && error.statusCode === 409) {
-                $scope.useradd.error.email = 'Email already taken';
-                $scope.useradd_form.email.$setPristine();
-                $('#inputUserAddEmail').focus();
-                return;
+                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) {