Merge pull request #382 from liuchuangww/user

Refactor user privacy
Typo fix