Fix user config
Merge remote-tracking branch 'upstream/user' into user
Fix redirect
Merge pull request #676 from liuchuangww/user

Fix user config