Updated login/registration behavior