Add changeMail support