Fix major login issues