diff --git a/setup/manageheader.php b/setup/manageheader.php
index 561d614840..50fb9bb327 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -168,7 +168,12 @@ function check_header_form()
 	// setting the domain settings from the posted content
 	foreach($_POST['domains'] as $key => $domain)
 	{
-		if ($_POST['deletedomain'][$key]) continue;	// domain deleted
+		if ($_POST['deletedomain'][$key]) 
+		{
+			// Need to actually remove the domain.  Drop the DB manually.
+			unset($GLOBALS['egw_domain'][$domain]);
+			continue;
+		}
 
 		foreach($_POST['setting_'.$key] as $name => $value)
 		{