diff --git a/src/views/email.html b/src/views/email.html
index 670a98d6d..e15eb5645 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -133,7 +133,7 @@
           </div>
           <div class="form-group">
             <label class="control-label">List Members</label><br/>
-            <multiselect ng-model="mailinglists.add.members" options="name for name in mailinglists.availableMailboxNames" data-multiple="true"></multiselect>
+            <multiselect ng-model="mailinglists.add.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true"></multiselect>
           </div>
           <input class="hide" type="submit" ng-disabled="mailinglistadd_form.$invalid || mailinglists.add.members.length === 0 || mailinglists.add.busy"/>
         </form>
@@ -161,7 +161,7 @@
             <div class="control-label" ng-show="mailinglists.edit.error">
               <small>{{ mailinglists.edit.error.message }}</small>
             </div>
-            <multiselect ng-model="mailinglists.edit.list.members" options="name for name in mailinglists.availableMailboxNames" data-multiple="true" autofocus></multiselect>
+            <multiselect ng-model="mailinglists.edit.list.members" options="mailbox.name for mailbox in mailboxes.mailboxes" data-compare-by="name" data-multiple="true" autofocus></multiselect>
           </div>
           <input class="hide" type="submit" ng-disabled="mailinglistedit_form.$invalid || mailinglists.edit.busy"/>
         </form>
diff --git a/src/views/email.js b/src/views/email.js
index 47ee5fd23..2d7edf980 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -62,7 +62,6 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
 
     $scope.mailinglists = {
         busy: false,
-        availableMailboxNames: [],
         mailinglists: [],
 
         add: {
@@ -86,7 +85,9 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             submit: function () {
                 $scope.mailinglists.add.busy = true;
 
-                Client.addMailingList($scope.selectedDomain.domain, $scope.mailinglists.add.name, $scope.mailinglists.add.members, function (error) {
+                var members = $scope.mailinglists.add.members.map(function (m) { return m.name; });
+
+                Client.addMailingList($scope.selectedDomain.domain, $scope.mailinglists.add.name, members, function (error) {
                     if (error) {
                         $scope.mailinglists.add.busy = false;
                         $scope.mailinglists.add.error = error;
@@ -152,20 +153,14 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         },
 
         refresh: function () {
-            Client.getMailboxes($scope.selectedDomain.domain, function (error, result) {
+            Client.listMailingLists($scope.selectedDomain.domain, function (error, result) {
                 if (error) return console.error(error);
 
-                $scope.mailinglists.availableMailboxNames = result.map(function (m) { return m.name; });
+                $scope.mailinglists.mailinglists = result.map(function (m) {
+                    m.orig = {};
+                    m.orig.members = m.members;
 
-                Client.listMailingLists($scope.selectedDomain.domain, function (error, result) {
-                    if (error) return console.error(error);
-
-                    $scope.mailinglists.mailinglists = result.map(function (m) {
-                        m.orig = {};
-                        m.orig.members = m.members;
-
-                        return m;
-                    });
+                    return m;
                 });
             });
         }