fix login bug
merge