diff --git a/app/models/setting.rb b/app/models/setting.rb
index 27f43a6..389c6e1 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -27,6 +27,9 @@ class Setting < RailsSettings::Base
   field :ejabberd_enabled, type: :boolean,
     default: (ENV["EJABBERD_API_URL"].present?.to_s || false)
 
+  field :ejabberd_api_url, type: :string,
+    default: ENV["EJABBERD_API_URL"].presence
+
   field :ejabberd_admin_url, type: :string,
     default: ENV["EJABBERD_ADMIN_URL"].presence
 
@@ -40,6 +43,25 @@ class Setting < RailsSettings::Base
   field :gitea_enabled, type: :boolean,
     default: (ENV["GITEA_PUBLIC_URL"].present?.to_s || false)
 
+  #
+  # Lightning Network
+  #
+
+  field :lndhub_api_url, type: :string,
+    default: ENV["LNDHUB_API_URL"].presence
+
+  field :lndhub_enabled, type: :boolean,
+    default: (ENV["LNDHUB_API_URL"].present?.to_s || false)
+
+  field :lndhub_admin_enabled, type: :boolean,
+    default: (ENV["LNDHUB_ADMIN_UI"] || false)
+
+  field :lndhub_public_key, type: :string,
+    default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
+
+  field :lndhub_keysend_enabled, type: :boolean,
+    default: -> { self.lndhub_public_key.present?.to_s || false }
+
   #
   # Mastodon
   #
@@ -61,18 +83,8 @@ class Setting < RailsSettings::Base
     default: (ENV["MEDIAWIKI_PUBLIC_URL"].present?.to_s || false)
 
   #
-  # Lightning Network
+  # Nostr
   #
 
-  field :lndhub_enabled, type: :boolean,
-    default: (ENV["LNDHUB_API_URL"].present?.to_s || false)
-
-  field :lndhub_admin_enabled, type: :boolean,
-    default: (ENV["LNDHUB_ADMIN_UI"] || false)
-
-  field :lndhub_public_key, type: :string,
-    default: (ENV["LNDHUB_PUBLIC_KEY"] || "")
-
-  field :lndhub_keysend_enabled, type: :boolean,
-    default: -> { self.lndhub_public_key.present?.to_s || false }
+  field :nostr_enabled, type: :boolean, default: true
 end