Completed the form fields on the system page. Reworked the way we detect if a user is system admin.
Merge remote-tracking branch 'origin/develop' into systemPage