diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index 187a5d7f7..73fd5ecac 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -261,11 +261,11 @@
     </div>
     <br/>
     <div class="row">
-        <p class="col-md-12" ng-show="!config.isCustomDomain && !config.isDev">
-            <b>Email can only be enabled for custom domains.</b>
+        <p class="col-md-12" ng-show="!config.isDev && (dnsConfig.provider === 'noop' || dnsConfig.provider === 'caas')">
+            <b>Email can only be enabled for custom domains with a DNS provider setup.</b>
         </p>
 
-        <div class="col-md-12" ng-show="config.isCustomDomain || config.isDev">
+        <div class="col-md-12" ng-show="config.isDev || !(dnsConfig.provider === 'noop' || dnsConfig.provider === 'caas')">
             <button ng-class="mailConfig.enabled ? 'btn btn-danger pull-right' : 'btn btn-primary pull-right'" ng-click="toggleEmail()" ng-enabled="mailConfig">{{ mailConfig.enabled ? "Disable Email" : "Enable Email" }}</button>
         </div>
     </div>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 8ef51d98c..f566f8b88 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -7,6 +7,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
     $scope.backupConfig = {};
+    $scope.dnsConfig = {};
     $scope.appstoreConfig = {};
 
     $scope.mailConfig = null;
@@ -364,6 +365,14 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         });
     }
 
+    function getDnsConfig() {
+        Client.getDnsConfig(function (error, dnsConfig) {
+            if (error) return console.error(error);
+
+            $scope.dnsConfig = dnsConfig;
+        });
+    }
+
     $scope.toggleEmail = function () {
         Client.setMailConfig({ enabled: !$scope.mailConfig.enabled }, function (error) {
             if (error) return console.error(error);
@@ -469,6 +478,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         fetchBackups();
         getMailConfig();
         getBackupConfig();
+        getDnsConfig();
 
         if ($scope.config.provider === 'caas') {
             getPlans();