diff --git a/management/whats_next.py b/management/whats_next.py
index 5afdfbb5..e97dce5e 100755
--- a/management/whats_next.py
+++ b/management/whats_next.py
@@ -35,6 +35,10 @@ def run_system_checks(env):
 	else:
 		print_ok("SSH disallows password-based login.")
 
+	# Check that the administrator alias exists since that's where all
+	# admin email is automatically directed.
+	check_alias_exists("administrator@" + env['PRIMARY_HOSTNAME'], env)
+
 	print()
 
 def run_domain_checks(env):
@@ -55,7 +59,6 @@ def run_domain_checks(env):
 
 		if domain == env["PRIMARY_HOSTNAME"]:
 			check_primary_hostname_dns(domain, env)
-			check_alias_exists("administrator@" + domain, env)
 		
 		if domain in dns_domains:
 			check_dns_zone(domain, env, dns_zonefiles)