Merge pull request #631 from liuchuangww/user

Fix validator
Merge remote-tracking branch 'upstream/user' into user