improve login flow and saving names as well