login fixes
merge