Fix issues with login