restructure Email & Password setting