fixed null login issues