diff --git a/management/dns_update.py b/management/dns_update.py
index 9f75325c..a7af3f06 100755
--- a/management/dns_update.py
+++ b/management/dns_update.py
@@ -292,11 +292,10 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en
         # This allows the following clients to automatically configure email addresses in the respective applications.
         # autodiscover.* - Z-Push ActiveSync Autodiscover
         # autoconfig.* - Thunderbird Autoconfig
-	if domain != env["PRIMARY_HOSTNAME"]:
-		if not has_rec("autodiscover", "A"):
-			records.append(("autodiscover", "A", env["PUBLIC_IP"], "Provides email configuration autodiscovery support for Z-Push ActiveSync Autodiscover."))
-		if not has_rec("autoconfig", "A"):
-			records.append(("autoconfig", "A", env["PUBLIC_IP"], "Provides email configuration autodiscovery support for Thunderbird Autoconfig."))
+	if not has_rec("autodiscover", "A"):
+		records.append(("autodiscover", "A", env["PUBLIC_IP"], "Provides email configuration autodiscovery support for Z-Push ActiveSync Autodiscover."))
+	if not has_rec("autoconfig", "A"):
+		records.append(("autoconfig", "A", env["PUBLIC_IP"], "Provides email configuration autodiscovery support for Thunderbird Autoconfig."))
 
 	# Sort the records. The None records *must* go first in the nsd zone file. Otherwise it doesn't matter.
 	records.sort(key = lambda rec : list(reversed(rec[0].split(".")) if rec[0] is not None else ""))
diff --git a/management/web_update.py b/management/web_update.py
index 6bfd675f..12959632 100644
--- a/management/web_update.py
+++ b/management/web_update.py
@@ -32,8 +32,8 @@ def get_web_domains(env, include_www_redirects=True, exclude_dns_elsewhere=True)
 	# Add Autoconfiguration domains, allowing us to serve correct SSL certs.
 	# 'autoconfig.' for Mozilla Thunderbird auto setup.
 	# 'autodiscover.' for Activesync autodiscovery.
-	domains |= set('autoconfig.' + zone for zone, zonefile in get_dns_zones(env))
-	domains |= set('autodiscover.' + zone for zone, zonefile in get_dns_zones(env))
+	domains |= set('autoconfig.' + maildomain for maildomain in get_mail_domains(env))
+	domains |= set('autodiscover.' + maildomain for maildomain in get_mail_domains(env))
 
 	# Ensure the PRIMARY_HOSTNAME is in the list so we can serve webmail
 	# as well as Z-Push for Exchange ActiveSync. This can't be removed