Rework the settings (and their security)