diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index f29f92386419226b2346f7097e841ce23330a0e8..1057786be7ac691ddb0c4ff8ec52882c77e9d5f2 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -304,7 +304,8 @@ class page_action extends tform_actions {
 		}
 		
 		//** If the email address has been changed, change it in all aliases too
-		if($this->oldDataRecord['email'] != $this->dataRecord['email']) {
+		if(isset($this->dataRecord['email']) && $this->oldDataRecord['email'] != $this->dataRecord['email']) {
+		//if($this->oldDataRecord['email'] != $this->dataRecord['email']) {
 			
 			//* Update the aliases
 			$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE destination = '".$app->db->quote($this->oldDataRecord['email'])."'");