Fixed change email feature