Fixed login bug
merge