Fix user data and edit user
Merge pull request #651 from liuchuangww/user

Fix user data and edit user