User module bug fixed
Merge remote-tracking branch 'upstream/user' into user
System component form bug fixed
Merge pull request #569 from sexnothing/user

User module bug fixed