Admin form cleanup

Merged colemanw requested to merge github/fork/colemanw/form into master

Merge request reports