sort out some login bug
Merge branch 'master' of https://github.com/ryanoolala/Project-Re-Bro