diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 23d759eb6..4e3b53841 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -119,13 +119,13 @@
                         <div ng-show="groups.length <= 1">No groups available.</div>
                     </div>
                     <h2 ng-show="useredit.busyFetching"><center><i class="fa fa-circle-o-notch fa-spin"></i></center></h2>
-                    <div ng-hide="useredit.busyFetching" class="form-group">
+                    <div ng-hide="useredit.busyFetching || useredit.availableEmailDomains.length === 0" class="form-group">
                         <label class="control-label">Email address on domains</label>
                         <div>
                             <multiselect ng-model="useredit.selectedEmailDomains" options="d.address for d in useredit.availableEmailDomains" data-multiple="true"></multiselect>
                         </div>
                     </div>
-                    <div class="form-group" ng-show="!useredit.busyFetching && useredit.userInfo.username" ng-class="{ 'has-error': useredit.error.aliases }">
+                    <div class="form-group" ng-hide="useredit.busyFetching || !useredit.userInfo.username || useredit.selectedEmailDomains.length === 0" ng-class="{ 'has-error': useredit.error.aliases }">
                         <label class="control-label">Email aliases</label>
 
                         <div class="control-label" ng-show="useredit.error.aliases">
@@ -198,7 +198,7 @@
             <div class="modal-body" ng-show="groupEdit.busyFetching">
                 <h2><center><i class="fa fa-circle-o-notch fa-spin"></i></center></h2>
             </div>
-            <div class="modal-body" ng-hide="groupEdit.busyFetching">
+            <div class="modal-body" ng-hide="groupEdit.busyFetching || groupEdit.availableLists.length === 0">
                 <form name="groupEditForm" role="form" ng-submit="groupEdit.submit()" autocomplete="off">
                     <input type="password" style="display: none;">
                     <div class="form-group">
@@ -211,9 +211,12 @@
                     <input class="hide" type="submit" ng-disabled="groupEditForm.$invalid || groupEdit.busy"/>
                 </form>
             </div>
+            <div class="modal-body" ng-show="!groupEdit.busyFetching && groupEdit.availableLists.length === 0">
+                Enable Email on a domain to configure group mailing lists here.
+            </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-success" ng-click="groupEdit.submit()" ng-disabled="groupEditForm.$invalid || groupEdit.busy"><i class="fa fa-circle-o-notch fa-spin" ng-show="groupEdit.busy"></i> Save</button>
+                <button type="button" class="btn btn-success" ng-click="groupEdit.submit()" ng-disabled="groupEditForm.$invalid || groupEdit.busy || groupEdit.availableLists.length === 0"><i class="fa fa-circle-o-notch fa-spin" ng-show="groupEdit.busy"></i> Save</button>
             </div>
         </div>
     </div>