Fix bugs in user profile changing
Merge branch 'raysmond'