Minor fixes on login, rename storage key vars.