Better handling of the email after save.