Improve admin settings

Stephen Mustgraverequested to merge
issue/scanner-3364450:3364450-new-admin-form into 2.0.x

Closes #3364450

Merge request reports