Improve admin settings

Closes #3364450

Merge request reports

Loading