Merge pull request #609 from liuchuangww/user

Fix delete admin account
Merge remote-tracking branch 'upstream/user' into user