Better handling of admin settings

Better handling of admin settings