Merged requested to merge 872-additional-settings into develop
See #872 (closed)
After discussion with @GinnyMcQueen, we agreed that a separate field for server rules would be better. And I've also added the missing setting for contact email.
Merging right away because I need it to continue working, and this is really small.