Fix login issues