Avoid false email address changes on update