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

System module form component update