diff --git a/src/settings.js b/src/settings.js
index 46754fb9b..1a2943778 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -141,14 +141,14 @@ function getEmailDnsRecords(callback) {
 
     function checkDkim(callback) {
         records.dkim = {
-            subdomain: constants.DKIM_SELECTOR + '._domainkey',
+            domain: constants.DKIM_SELECTOR + '._domainkey.' + config.fqdn(),
             type: 'TXT',
             expected: 'v=DKIM1; t=s; p=' + dkimKey,
             value: null,
             status: false
         };
 
-        dns.resolveTxt(records.dkim.subdomain + '.' + config.fqdn(), function (error, txtRecords) {
+        dns.resolveTxt(records.dkim.domain, function (error, txtRecords) {
             if (error && error.code === 'ENOTFOUND') return callback(null);    // not setup
             if (error) return callback(error);
 
@@ -164,7 +164,7 @@ function getEmailDnsRecords(callback) {
 
     function checkSpf(callback) {
         records.spf = {
-            subdomain: '',
+            domain: config.fqdn(),
             type: 'TXT',
             value: null,
             expected: null,
@@ -172,7 +172,7 @@ function getEmailDnsRecords(callback) {
         };
 
         // check if SPF is already setup
-        dns.resolveTxt(config.fqdn(), function (error, txtRecords) {
+        dns.resolveTxt(records.spf.domain, function (error, txtRecords) {
             if (error && error.code === 'ENOTFOUND') return callback(null);    // not setup
             if (error) return callback(error);
 
@@ -201,14 +201,14 @@ function getEmailDnsRecords(callback) {
 
     function checkMx(callback) {
         records.mx = {
-            subdomain: '',
+            domain: config.fqdn(),
             type: 'MX',
             value: null,
             expected: '10 ' + config.mailFqdn(),
             status: false
         };
 
-        dns.resolveMx(config.fqdn(), function (error, mxRecords) {
+        dns.resolveMx(records.mx.domain, function (error, mxRecords) {
             if (error && error.code === 'ENOTFOUND') return callback(null);    // not setup
             if (error) return callback(error);
 
@@ -221,14 +221,14 @@ function getEmailDnsRecords(callback) {
 
     function checkDmarc(callback) {
         records.dmarc = {
-            subdomain: '_dmarc',
+            domain: '_dmarc.' + config.fqdn(),
             type: 'TXT',
             value: null,
             expected: 'v=DMARC1; p=reject; pct=100',
             status: false
         };
 
-        dns.resolveTxt(records.dmarc.subdomain + '.' + config.fqdn(), function (error, txtRecords) {
+        dns.resolveTxt(records.dmarc.domain, function (error, txtRecords) {
             if (error && error.code === 'ENOTFOUND') return callback(null);    // not setup
             if (error) return callback(error);
 
@@ -243,7 +243,7 @@ function getEmailDnsRecords(callback) {
 
     function checkPtr(callback) {
         records.ptr = {
-            subdomain: '',
+            domain: null,
             type: 'PTR',
             value: null,
             expected: config.mailFqdn(),
@@ -253,6 +253,8 @@ function getEmailDnsRecords(callback) {
         sysinfo.getIp(function (error, ip) {
             if (error) return callback(error);
 
+            records.ptr.domain = ip.split('.').reverse().join('.') + '.in-addr.arpa';
+
             dns.reverse(ip, function (error, records) {
                 if (error && error.code === 'ENOTFOUND') return callback(null);    // not setup
                 if (error) return callback(error);
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index d686de90e..623776ed5 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -299,7 +299,7 @@
     <br/>
     <div class="row">
         <div class="col-md-12" ng-show="mailConfig.enabled && (dnsConfig.provider === 'noop' || dnsConfig.provider === 'manual')">
-            Set the following DNS records for <b><tt>{{ config.fqdn }}</tt></b> to guarantee email functionality.
+            Set the following DNS records to guarantee email functionality.
 
             <div ng-repeat="record in expectedDnsRecordsTypes">
                <div class="row">
@@ -311,7 +311,7 @@
                         <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#collapse_dns_{{ record.value }}">Advanced</a>
                         <div id="collapse_dns_{{ record.value }}" class="panel-collapse collapse">
                             <div class="panel-body">
-                                <p>Subdomain: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].subdomain }}</tt></b></p>
+                                <p>Domain: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].domain }}</tt></b></p>
                                 <p>Record type: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].type }}</tt></b></p>
                                 <p style="overflow: auto; white-space: nowrap;">Expected value: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].expected }}</tt></b></p>
                                 <p style="overflow: auto; white-space: nowrap;">Current value: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].value ? expectedDnsRecords[record.value].value : '[not set]' }}</tt></b></p>