diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 74ea1702bad971360f626609df45dcd4b3310004..ee16ad6a1ee4b2cfc7486045795034c7e72cc5d9 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -298,6 +298,11 @@ class page_action extends tform_actions {
 				}
 			}
 			
+			//* Delete the old spamfilter record
+			$tmp = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".mysql_real_escape_string($this->oldDataRecord["domain"])."'");
+			$app->db->datalogDelete('spamfilter_users', 'id', $tmp["id"]);
+			unset($tmp);
+			
 		} // end if domain name changed
 		
 	}