Fix edit user account and add custom activity
Merge pull request #556 from liuchuangww/user

Fix edit user account and add custom activity