diff --git a/lib/towerops_web/live/org/settings_live.ex b/lib/towerops_web/live/org/settings_live.ex
index b636023d..1deab69b 100644
--- a/lib/towerops_web/live/org/settings_live.ex
+++ b/lib/towerops_web/live/org/settings_live.ex
@@ -442,6 +442,8 @@ defmodule ToweropsWeb.Org.SettingsLive do
     socket =
       if socket.assigns.configuring == "netbox" do
         assign(socket, :netbox_config, %{
+          "url" => Map.get(params, "url", ""),
+          "api_token" => Map.get(params, "api_token", ""),
           "sync_direction" => Map.get(params, "sync_direction", "pull"),
           "sync_devices" => Map.get(params, "sync_devices", "true") == "true",
           "sync_sites" => Map.get(params, "sync_sites", "true") == "true",
@@ -921,6 +923,8 @@ defmodule ToweropsWeb.Org.SettingsLive do
 
   defp default_netbox_config do
     %{
+      "url" => "",
+      "api_token" => "",
       "sync_direction" => "pull",
       "sync_devices" => true,
       "sync_sites" => true,
@@ -936,6 +940,8 @@ defmodule ToweropsWeb.Org.SettingsLive do
 
   defp load_netbox_config(%Integration{credentials: creds}) when is_map(creds) do
     %{
+      "url" => Map.get(creds, "url", ""),
+      "api_token" => Map.get(creds, "api_token", ""),
       "sync_direction" => Map.get(creds, "sync_direction", "pull"),
       "sync_devices" => Map.get(creds, "sync_devices", true),
       "sync_sites" => Map.get(creds, "sync_sites", true),
diff --git a/lib/towerops_web/live/org/settings_live.html.heex b/lib/towerops_web/live/org/settings_live.html.heex
index 4daa36a0..bf830413 100644
--- a/lib/towerops_web/live/org/settings_live.html.heex
+++ b/lib/towerops_web/live/org/settings_live.html.heex
@@ -1204,7 +1204,7 @@
                             <input
                               type="text"
                               name="integration[url]"
-                              value={get_credential(@integrations["netbox"], "url")}
+                              value={@netbox_config["url"]}
                               placeholder="https://netbox.example.com"
                               autocomplete="off"
                               class="block w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 placeholder-gray-400 focus:border-indigo-500 focus:ring-indigo-500 dark:border-white/10 dark:bg-gray-800 dark:text-white dark:placeholder-gray-500"
@@ -1217,7 +1217,7 @@
                             <input
                               type="password"
                               name="integration[api_token]"
-                              value={get_credential(@integrations["netbox"], "api_token")}
+                              value={@netbox_config["api_token"]}
                               placeholder={t("Enter your NetBox API token")}
                               autocomplete="off"
                               class="block w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm text-gray-900 placeholder-gray-400 focus:border-indigo-500 focus:ring-indigo-500 dark:border-white/10 dark:bg-gray-800 dark:text-white dark:placeholder-gray-500"