Fixing login issues