Some login issues fixed