Make sure mail is set before we change it