diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index ac668b2cf..d52951f68 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -43,7 +43,7 @@
                         </p>
 
                         <p class="text-center" ng-show="!appConfigure.usingAltDomain && appConfigure.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
-                            <b>Do not forget to add an A record for {{ appConfigure.location }}.{{ config.fqdn }}</b>
+                            <b>Add an A record manually for {{ appConfigure.location }} to this Cloudron's public IP</b>
                             <br>
                         </p>
 
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 84063a378..0c52cb747 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -36,7 +36,7 @@
                         </div>
 
                         <p class="text-center" ng-show="appInstall.location && dnsConfig.provider === 'manual' && !dnsConfig.wildcard">
-                            <b>Do not forget to add an A record for {{ appInstall.location }}.{{ config.fqdn }}</b>
+                            <b>Add an A record manually for {{ appInstall.location }} to this Cloudron's public IP</b>
                             <br>
                         </p>
 
diff --git a/webadmin/src/views/domains.html b/webadmin/src/views/domains.html
index 71eb2f054..9549b6734 100644
--- a/webadmin/src/views/domains.html
+++ b/webadmin/src/views/domains.html
@@ -217,7 +217,7 @@
                   {{ domain.provider }}
                 </td>
                 <td class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.fqdn && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
+                  <button class="btn btn-xs btn-default" ng-click="domainMigrate.show(domain)" ng-show="domain.domain !== config.adminDomain && domain.provider !== 'caas' && provider === 'caas'" title="Migrate Domain"><i class="fa fa-exchange"></i></button>
                   <button class="btn btn-xs btn-default" ng-click="domainConfigure.show(domain)" ng-show="domain.provider !== 'caas'" title="Edit Domain"><i class="fa fa-pencil"></i></button>
                   <button class="btn btn-xs btn-danger" ng-click="domainRemove.show(domain)" ng-show="domain.provider !== 'caas'" title="Remove Domain"><i class="fa fa-trash-o"></i></button>
                 </td>
diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index 78585bfe0..23d759eb6 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -293,8 +293,8 @@
           </div>
           <div class="row animateMeOpacity ng-hide" ng-show="ready">
               <div class="col-lg-12">
-                  <span ng-show="mailConfig.enabled">
-                      Each user has a mailbox at <b><i>username</i>@{{ config.fqdn }}</b>.
+                  <span>
+                      For email enabled domains, each user has a mailbox at <b><i>username@domain</i></b>.
                       Please refer to the <a ng-href="{{ config.webServerOrigin + '/documentation/email/#imap-settings-for-cloudron-email' }}" target="_blank">user documentation</a> on how to use Cloudron email accounts.
                       <br/>
                       <br/>
@@ -314,7 +314,7 @@
                                   <i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user is an admin and can manage apps, groups and other users"></i>
                               </td>
                               <td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-show="user.username">
-                                  {{ user.username }} &nbsp; <span class="text-muted" ng-hide="mailConfig.enabled">{{ user.email }}</span>
+                                  {{ user.username }} &nbsp; <span class="text-muted">{{ user.email }}</span>
                               </td>
                               <td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-hide="user.username">
                                   <span class="text-muted" uib-tooltip="User is not activated yet">{{ user.fallbackEmail }}</span>
@@ -354,8 +354,7 @@
           </div>
           <div class="row animateMeOpacity ng-hide" ng-show="ready">
               <div class="col-lg-12">
-                  Groups can be used to control access to an app.
-                  <span ng-show="mailConfig.enabled">Each group serves as an email list at <b><i>groupname</i>@{{ config.fqdn }}</b>. Any email sent to this address will be forwarded to each group member.</span>
+                  Groups can be used to control access to an app. When Cloudron email is enabled, each group also serves as an email list at <b><i>groupname@domain</i></b>. Any email sent to this address will be forwarded to each group member.</span>
                   <br/>
                   <br/>
                   <table class="table table-hover">
diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js
index c43b53887..dd53114b3 100644
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -29,11 +29,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
     $scope.userInfo = Client.getUserInfo();
     $scope.emailDomains = [];
 
-    // FIXME this needs a whole lot of rework as it is used for alias ui, which now needs to be multidomain aware
-    $scope.mailConfig = {
-        enabled: false
-    };
-
     $scope.userremove = {
         busy: false,
         error: {},