diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index ceb90d70a..e77699ef9 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -98,8 +98,7 @@
                             </span>
                         </div>
                     </div>
-                    <br/>
-                    <div class="form-group" ng-show="(config.isDev || config.isCustomDomain)">
+                    <div class="form-group" ng-show="useredit.userInfo.username && (config.isDev || config.isCustomDomain)">
                         <label class="control-label">Email aliases</label>
                         <div class="form-group">
                             <input type="text" class="form-control" ng-model="useredit.aliases" name="aliases" placeholder="Separate aliases by comma">
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 78d58e9c9..be3f53abf 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -266,7 +266,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 if (error) return console.error('Unable to update groups for user:', error);
 
                 var aliases = $scope.useredit.aliases ? $scope.useredit.aliases.split(',') : [ ];
-                Client.setAliases($scope.useredit.userInfo.username, aliases, function (error) {
+                var setAliasesFunc = Client.setAliases.bind(null, $scope.useredit.userInfo.username, aliases);
+
+                // cannot set aliases without username
+                if (!$scope.useredit.userInfo.username) setAliasesFunc = function (next) { return next(); };
+
+                setAliasesFunc(function (error) {
                     $scope.useredit.busy = false;
 
                     if (error) return console.error('Unable to update aliases for user:', error);