diff --git a/conduit-example.toml b/conduit-example.toml
index 70d3ce4..b82da2c 100644
--- a/conduit-example.toml
+++ b/conduit-example.toml
@@ -23,12 +23,12 @@ port = 6167
 max_request_size = 20_000_000 # in bytes
 
 # Disable registration. No new users will be able to register on this server
-#registration_disabled = false
+#allow_registration = true
 
 # Disable encryption, so no new encrypted rooms can be created
 # Note: existing rooms will continue to work
-#encryption_disabled = false
-#federation_disabled = false
+#allow_encryption = true
+#allow_federation = false
 
 #cache_capacity = 1073741824 # in bytes, 1024 * 1024 * 1024
 #max_concurrent_requests = 4 # How many requests Conduit sends to other servers at the same time
diff --git a/src/database.rs b/src/database.rs
index afcd58f..9fce293 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -32,7 +32,7 @@ pub struct Config {
     max_request_size: u32,
     #[serde(default = "default_max_concurrent_requests")]
     max_concurrent_requests: u16,
-    #[serde(default)]
+    #[serde(default = "true_fn")]
     allow_registration: bool,
     #[serde(default = "true_fn")]
     allow_encryption: bool,