System component form update
User module update
Merge pull request #898 from sexnothing/develop

System component form update