diff --git a/src/views/email.html b/src/views/email.html
index a24d5bbf1..25e08c35a 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -500,7 +500,7 @@
             <div class="col-md-12">
               <h4>DNS Status</h4>
 
-              Set the following DNS records to guarantee email delivery:
+              Set the following DNS records for <b><tt>{{ selectedDomain.domain }}</tt></b> to guarantee email delivery:
 
               <br/><br/>
 
@@ -514,7 +514,8 @@
                     </p>
                     <div id="collapse_dns_{{ record.value }}" class="panel-collapse collapse">
                       <div class="panel-body">
-                        <p>Domain: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].domain }}</tt></b></p>
+                        <p ng-show="expectedDnsRecords[record.value].name">Hostname: <b ng-click-select><tt>{{ expectedDnsRecords[record.value].name }}</tt></b></p>
+                        <p ng-hide="expectedDnsRecords[record.value].name">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>