User profile bug fixed
Merge pull request #634 from sexnothing/user

User profile bug fixed
Merge remote-tracking branch 'upstream/user' into user