diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js
index 9fd09c421..4d99d02a1 100644
--- a/webadmin/src/js/client.js
+++ b/webadmin/src/js/client.js
@@ -417,6 +417,13 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
         }).error(defaultErrorHandler(callback));
     };
 
+    Client.prototype.getMailboxes = function (callback) {
+        $http.get(client.apiOrigin + '/api/v1/mailboxes').success(function (data, status) {
+            if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
+            callback(null, data.mailboxes);
+        }).error(defaultErrorHandler(callback));
+    };
+
     Client.prototype.setGroups = function (userId, groupIds, callback) {
         $http.put(client.apiOrigin + '/api/v1/users/' + userId + '/set_groups', { groupIds: groupIds }).success(function (data, status) {
             if (status !== 204) return callback(new ClientError(status, data));
diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 48919e5dc..bc15db4e6 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -99,6 +99,13 @@
                         </div>
                     </div>
                     <br/>
+                    <div class="form-group" ng-show="config.isCustomDomain && useredit.username">
+                        <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">
+                        </div>
+                    </div>
+                    <br/>
                     <div class="form-group" ng-hide="isMe(useredit.userInfo)">
                         <div class="checkbox">
                             <label>
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index 6cbcce3a3..807fd8012 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -6,6 +6,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.ready = false;
     $scope.users = [];
     $scope.groups = [];
+    $scope.config = Client.getConfig();
     $scope.userInfo = Client.getUserInfo();
 
     $scope.userremove = {
@@ -29,6 +30,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         error: {},
         userInfo: {},
         email: '',
+        aliases: '',
         superuser: false
     };
 
@@ -214,6 +216,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         $scope.useredit.error.email = null;
         $scope.useredit.email = userInfo.email;
         $scope.useredit.userInfo = userInfo;
+        $scope.useredit.aliases = mailboxes[userInfo.username].aliases.join(',');
         $scope.useredit.groupIds = angular.copy(userInfo.groupIds);
         $scope.useredit.superuser = userInfo.groupIds.indexOf('admin') !== -1;
 
@@ -254,21 +257,26 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             }
 
             Client.setGroups(data.id, $scope.useredit.groupIds, function (error) {
-                $scope.useredit.busy = false;
-
                 if (error) return console.error('Unable to update groups for user:', error);
 
-                $scope.useredit.userInfo = {};
-                $scope.useredit.email = '';
-                $scope.useredit.superuser = false;
-                $scope.useredit.groupIds = [];
+                Client.setAliases($scope.useredit.userInfo.username, $scope.useredit.aliases.split(','), function (error) {
+                    $scope.useredit.busy = false;
 
-                $scope.useredit_form.$setPristine();
-                $scope.useredit_form.$setUntouched();
+                    if (error) return console.error('Unable to update aliases for user:', error);
 
-                refresh();
+                    $scope.useredit.userInfo = {};
+                    $scope.useredit.email = '';
+                    $scope.useredit.superuser = false;
+                    $scope.useredit.groupIds = [];
+                    $scope.useredit.aliases = '';
 
-                $('#userEditModal').modal('hide');
+                    $scope.useredit_form.$setPristine();
+                    $scope.useredit_form.$setUntouched();
+
+                    refresh();
+
+                    $('#userEditModal').modal('hide');
+                });
             });
         });
     };
@@ -335,7 +343,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 if (error) return console.error('Unable to get user listing.', error);
 
                 $scope.users = result;
-                $scope.ready = true;
+
+                Client.getMailboxes(function (error, result) {
+                    if (error) return console.error('Unable to get mailboxes.', error);
+
+                    $scope.mailboxes = result;
+
+                    $scope.ready = true;
+                });
             });
         });
     }