diff --git a/Slon/Http/AdminServer.HC b/Slon/Http/AdminServer.HC
index 6589d28..3c8acb5 100644
--- a/Slon/Http/AdminServer.HC
+++ b/Slon/Http/AdminServer.HC
@@ -328,6 +328,10 @@ U0 @slon_admin_server_get(SlonHttpSession* session)
         session->send(db->o("instance"));
         return;
     }
+    if (!StrICmp("/manage/settings", session->path())) {
+        session->send(db->o("settings"));
+        return;
+    }
 
     if (!StrICmp("/", session->path())) {
         @slon_http_send_html_file(session, "M:/Slon/Static/html/admin/main.html");
@@ -355,6 +359,17 @@ U0 @slon_admin_setup_instance(SlonHttpSession* session)
     session->send(SLON_EMPTY_JSON_OBJECT);
 }
 
+U0 @slon_admin_save_settings(SlonHttpSession* session)
+{
+    SLON_SCRATCH_BUFFER_AND_REQUEST_JSON
+    no_warn scratch_buffer;
+
+    db->set("settings", request_json, JSON_OBJECT);
+    @slon_db_save_settings_to_disk;
+
+    session->send(SLON_EMPTY_JSON_OBJECT);
+}
+
 U0 @slon_admin_server_post(SlonHttpSession* session)
 {
     if (StrFind("json", session->header("content-type")) > 0) {
@@ -366,6 +381,11 @@ U0 @slon_admin_server_post(SlonHttpSession* session)
         return;
     }
 
+    if (!StrICmp("/save/settings", session->path())) {
+        @slon_admin_save_settings(session);
+        return;
+    }
+
     if (!StrICmp("/new/account", session->path())) {
         @slon_admin_new_account(session);
         return;
diff --git a/Slon/Modules/Db.HC b/Slon/Modules/Db.HC
index bde07e2..8c2f692 100644
--- a/Slon/Modules/Db.HC
+++ b/Slon/Modules/Db.HC
@@ -107,6 +107,13 @@ U0 @slon_db_load_markers_from_disk()
     db->set("markers", markers, JSON_OBJECT);
 }
 
+U0 @slon_db_load_settings_from_disk()
+{
+    U8 scratch_buffer[256];
+    StrPrint(scratch_buffer, "%s/settings.json", SLON_DB_PATH);
+    db->set("settings", Json.ParseFile(scratch_buffer), JSON_OBJECT);
+}
+
 U0 @slon_db_load_statuses_from_disk()
 {
     JsonObject* statuses = Json.CreateObject();
@@ -228,6 +235,13 @@ U0 @slon_db_save_markers_to_disk()
     }
 }
 
+U0 @slon_db_save_settings_to_disk()
+{
+    U8 scratch_buffer[256];
+    StrPrint(scratch_buffer, "%s/settings.json", SLON_DB_PATH);
+    Json.DumpToFile(scratch_buffer, db->o("settings"));
+}
+
 U0 @slon_db_save_statuses_to_disk()
 {
     U8 scratch_buffer[256];
@@ -263,6 +277,7 @@ U0 @slon_db_save_to_disk()
     @slon_db_save_markers_to_disk();
     @slon_db_save_oauth_to_disk();
     @slon_db_save_private_keys_to_disk();
+    @slon_db_save_settings_to_disk();
     @slon_db_save_statuses_to_disk();
     @slon_db_save_timelines_to_disk();
 }
@@ -281,6 +296,7 @@ U0 @slon_db_load_from_defaults()
     db->set("instance", Json.ParseFile("M:/Slon/Static/defaults/instance.json"), JSON_OBJECT);
     db->set("markers", Json.CreateObject(), JSON_OBJECT);
     db->set("media", Json.CreateObject(), JSON_OBJECT);
+    db->set("settings", Json.CreateObject(), JSON_OBJECT);
     db->set("statuses", Json.CreateObject(), JSON_OBJECT);
     db->set("timelines", Json.CreateObject(), JSON_OBJECT);
     db->o("timelines")->set("home", Json.CreateObject(), JSON_OBJECT);
@@ -309,6 +325,7 @@ U0 @slon_db_load_from_disk()
     @slon_db_load_markers_from_disk();
     db->set("media", Json.CreateObject(), JSON_OBJECT);
     @slon_db_load_oauth_from_disk();
+    @slon_db_load_settings_from_disk();
     @slon_db_load_statuses_from_disk();
     @slon_db_load_timelines_from_disk();
     db->set("setup", TRUE, JSON_BOOLEAN);
diff --git a/Slon/Static/html/admin/main.html b/Slon/Static/html/admin/main.html
index cb4eef0..941cb67 100644
--- a/Slon/Static/html/admin/main.html
+++ b/Slon/Static/html/admin/main.html
@@ -36,6 +36,7 @@
         <ul class="menu-list">
             <li><a onclick="manageAccounts(0)" id="menuitem-accounts">Accounts</a></li>
             <li><a onclick="manageInstance()" id="menuitem-instance">Instance</a></li>
+            <li><a onclick="manageSettings()" id="menuitem-settings">Settings</a></li>
         </ul>
         <p class="menu-label">Diagnostics</p>
         <ul class="menu-list">
@@ -45,6 +46,7 @@
     <div id="content" class="container main-content is-inline-block">
     </div>
     <script>
+        let obscured_setting_names = ["catbox_userhash"];
         function clearActiveLinks() {
             document.querySelectorAll("a").forEach(function (a) { a.className = ""; });
         }
@@ -117,6 +119,69 @@
             setContent(html);
             setActiveLink("instance");
         }
+        async function manageSettings() {
+            clearActiveLinks();
+            const request = new Request("/manage/settings");
+            const response = await fetch(request);
+            const settings = await response.json();
+            const keys = Object.keys(settings);
+
+            let html = "<h4 class=\"title is-4\">Settings</h4><div class=spacer></div>";
+            html += "<form action=\"javascript:saveSettings()\"><div>";
+            html += "<table class=table><thead><tr><th>name</th><th>value</th><th>delete</th></tr></head><tbody>";
+            if (keys.length) {
+                for (let i = 0; i < keys.length; i++) {
+                    let inputType = "text";
+                    if (obscured_setting_names.indexOf(keys[i]) != -1) {
+                        inputType = "password";
+                    }
+                    html += "<tr><td>" + keys[i] + "</td><td><div class=control><input autocomplete=off class=input id=settings_" + keys[i] + " type=\"" + inputType + "\" value=\"" + settings[keys[i]] + "\"></div></td><td style=\"text-align:center\"><a href=\"javascript:deleteSetting('" + keys[i] + "');\">&#10060;</a></td>"
+                }
+            }
+            html += "</tbody></table>";
+            html += "<div class=\"control is-inline\"><input autocomplete=off class=\"input is-inline\" id=new_name placeholder=name></div> ";
+            html += "<div class=\"control is-inline\"><input autocomplete=off class=\"input is-inline\" id=new_value placeholder=value></div> ";
+            html += "<div class=\"control is-inline\"><input class=\"button is-inline\" onclick=\"addSetting()\" type=button value=Add></div> ";
+            html += "<div class=\"control next\"><input class=\"button is-link\" type=submit value=Save></div>";
+            html += "</div></form>";
+            setContent(html);
+            setActiveLink("settings");
+        }
+        function addSetting() {
+            let name = document.getElementById("new_name").value;
+            let value = document.getElementById("new_value").value;
+            if (name.indexOf(" ") != -1) {
+                alert("key can not contain spaces: " + name);
+                return;
+            }
+            if (document.getElementById("settings_" + name)) {
+                alert("key already exists: " + name);
+                return;
+            }
+            let inputType = "text";
+            if (obscured_setting_names.indexOf(name) != -1) {
+                inputType = "password";
+            }
+            let new_setting_html = "<tr><td>" + name + "</td><td><div class=control><input autocomplete=off class=input id=settings_" + name + " type=\"" + inputType + "\" value=\"" + value + "\"></div></td><td style=\"text-align:center\"><a href=\"javascript:deleteSetting('" + name + "');\">&#10060;</a></td>";
+            document.getElementsByTagName("tbody")[0].innerHTML += new_setting_html;
+        }
+        function deleteSetting(name) {
+            document.getElementById("settings_" + name).parentElement.parentElement.parentElement.remove();
+        }
+        async function saveSettings() {
+            let data = {};
+            let fields = document.querySelectorAll("[id^=settings_]")
+            for (var i = 0; i < fields.length; i++) {
+                data[fields[i].id.split("settings_")[1]] = fields[i].value;
+            }
+            const request = new Request("/save/settings", {
+                headers: { "Content-Type": "application/json" },
+                method: "POST",
+                body: JSON.stringify(data)
+            });
+            const response = await fetch(request);
+            manageSettings();
+        }
         async function confirmDeleteUser(user, id) {
             if (confirm("Are you sure you want to delete '" + user + "' ?")) {
                 const request = new Request("/delete/account?id=" + id);