Fix login
Merge pull request #608 from liuchuangww/user

Fix login
Merge branch 'user' into i18n