Fixed changing (or not changing) email address