Fix add user
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #636 from liuchuangww/user

User