fixed login issues
merge conflicts