Moved change email validation to service