Fix deletion of email address