diff --git a/webadmin/src/views/email.html b/webadmin/src/views/email.html
index 3015ca0b8..a0a7d2be4 100644
--- a/webadmin/src/views/email.html
+++ b/webadmin/src/views/email.html
@@ -195,12 +195,13 @@
     </div>
   </div>
 
-  <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
+  <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas' && currentRelay.provider === 'cloudron-smtp'">
     <h3>DNS Records</h3>
   </div>
 
-  <div class="card" style="margin-bottom: 15px;" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
+  <div class="card" style="margin-bottom: 15px;" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas' && currentRelay.provider === 'cloudron-smtp'">
     <div class="row">
+
       <div class="col-md-12">
         Set the following DNS records to guarantee email delivery:
 
@@ -225,8 +226,10 @@
             </div>
           </div>
         </div>
+
       </div>
     </div>
+
   </div>
 
   <div class="text-left" ng-show="dnsConfig.provider && dnsConfig.provider !== 'caas'">
@@ -241,12 +244,12 @@
           <div class="col-xs-12">
             <p class="text-muted">
               <i ng-hide="email.refreshBusy" ng-class="relay.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
-              <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_dns_port">
+              <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_outbound_smtp">
                 Outbound SMTP
               </a>
               <button class="btn btn-xs btn-default" ng-click="email.refresh()" ng-disabled="email.refreshBusy" ng-show="!relay.status"><i class="fa fa-refresh" ng-class="{ 'fa-pulse': email.refreshBusy }"></i></button>
             </p>
-            <div id="collapse_dns_port" class="panel-collapse collapse">
+            <div id="collapse_outbound_smtp" class="panel-collapse collapse">
               <div class="panel-body">
                 <p><b> {{ relay.value }} </b> </p>
               </div>
@@ -254,7 +257,7 @@
           </div>
         </div>
 
-        <div class="row">
+        <div class="row" ng-show="currentRelay.provider === 'cloudron-smtp'">
           <div class="col-xs-12">
             <p class="text-muted">
               <i ng-hide="email.refreshBusy" ng-class="rbl.status ? 'fa fa-check-circle text-success' : 'fa fa-exclamation-triangle text-danger'"></i> &nbsp;
@@ -274,8 +277,6 @@
           </div>
         </div>
 
-        <br/>
-
         <div class="row">
           <div class="col-xs-12">
             <button class="btn btn-primary pull-left" ng-click="testEmail.show()">Send Test Email</button>
diff --git a/webadmin/src/views/email.js b/webadmin/src/views/email.js
index 59050db74..de43d3844 100644
--- a/webadmin/src/views/email.js
+++ b/webadmin/src/views/email.js
@@ -7,6 +7,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
     $scope.dnsConfig = {};
+    $scope.currentRelay = {};
     $scope.relay = {};
     $scope.rbl = null;
     $scope.expectedDnsRecords = {
@@ -87,6 +88,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         refresh: function () {
             $scope.email.refreshBusy = true;
 
+            collapseDnsRecords();
+
             showExpectedDnsRecords(function (error) {
                 if (error) console.error(error);
 
@@ -156,10 +159,16 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             }
 
             Client.setMailRelay(data, function (error) {
-                if (error) $scope.mailRelay.error = error.message;
-                else $scope.mailRelay.success = true;
-
                 $scope.mailRelay.busy = false;
+
+                if (error) {
+                    $scope.mailRelay.error = error.message;
+                    return;
+                }
+
+                $scope.currentRelay = data;
+                $scope.mailRelay.success = true;
+                $scope.email.refresh();
             });
         }
     };
@@ -221,6 +230,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             $scope.mailRelay.relay.password = '';
             $scope.mailRelay.relay.serverApiToken = '';
 
+            $scope.currentRelay = relay;
+
             if (relay.provider === 'postmark-smtp') {
                 $scope.mailRelay.relay.serverApiToken = relay.username;
             } else if (relay.provider === 'sendgrid-smtp') {
@@ -248,6 +259,16 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         });
     }
 
+    function collapseDnsRecords() {
+        $scope.expectedDnsRecordsTypes.forEach(function (record) {
+            var type = record.value;
+            $('#collapse_dns_' + type).collapse('hide');
+        });
+
+        $('#collapse_outbound_smtp').collapse('hide');
+        $('#collapse_rbl').collapse('hide');
+    }
+
     function showExpectedDnsRecords(callback) {
         callback = callback || function (error) { if (error) console.error(error); };
 
@@ -258,16 +279,21 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
             $scope.rbl = result.rbl;
 
             // open the record details if they are not correct
-            for (var type in $scope.expectedDnsRecords) {
-                $scope.expectedDnsRecords[type] = result.dns[type];
+            $scope.expectedDnsRecordsTypes.forEach(function (record) {
+                var type = record.value;
+                $scope.expectedDnsRecords[type] = result.dns[type] || {};
 
                 if (!$scope.expectedDnsRecords[type].status) {
                     $('#collapse_dns_' + type).collapse('show');
                 }
-            }
+            });
 
             if (!$scope.relay.status) {
-                $('#collapse_dns_port').collapse('show');
+                $('#collapse_outbound_smtp').collapse('show');
+            }
+
+            if (!$scope.rbl.status) {
+                $('#collapse_rbl').collapse('show');
             }
 
             callback(null);