diff --git a/apps/andi/lib/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form.ex b/apps/andi/lib/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form.ex
index 3cb4530aa..e827de061 100644
--- a/apps/andi/lib/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form.ex
+++ b/apps/andi/lib/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form.ex
@@ -36,15 +36,15 @@ defmodule AndiWeb.ExtractSteps.ExtractSecretStepForm do
             <div class="extract-secret-step-form-edit-section form-grid">
 
               <div class="extract-secret-step-form__destination">
-                <%= label(f, :destination, DisplayNames.get(:destination), class: "label label--required") %>
+                <%= label(f, :destination, DisplayNames.get(:destination), class: "label label--required", for: "step_#{@id}__secret_destination") %>
                 <%= text_input(f, :destination, [id: "step_#{@id}__secret_destination", class: "extract-secret-step-form__destination input", phx_target: "#step-#{@id}", required: true]) %>
                 <%= ErrorHelpers.error_tag(f, :destination) %>
               </div>
 
               <div class="extract-secret-step-form__value">
-                <%= label(f, :secret_value, DisplayNames.get(:secret_value), class: "label label--required") %>
+                <%= label(f, :secret_value, DisplayNames.get(:secret_value), class: "label label--required", for: "step_#{@id}__secret_value") %>
                 <div class="secret_value_add">
-                  <%= text_input(f, :secret_value, [id: "step_#{@id}__secret_destination", type: "password", class: "extract-secret-step-form__secret-value input", phx_target: "#step-#{@id}", placeholder: "Secrets are not displayed after being saved", required: true]) %>
+                  <%= text_input(f, :secret_value, [id: "step_#{@id}__secret_value", type: "password", class: "extract-secret-step-form__secret-value input", phx_target: "#step-#{@id}", placeholder: "Secrets are not displayed after being saved", required: true]) %>
                   <% secret_value = FormData.input_value(nil, f, :secret_value) %>
                   <button type="button" class="btn btn--action" phx-click="save_secret" <%= disable_add_button(@changeset, secret_value) %> phx-target='<%="#step-#{@id}"%>' phx-value-secret="<%= secret_value %>">Add</button>
                   <span class="secret__status-msg <%= save_success_class(@save_success) %>"><%= @save_secret_message %></span>
diff --git a/apps/andi/test/integration/andi_web/live/ingestion_live_view/extract_steps/extract_http_step_form_test.exs b/apps/andi/test/integration/andi_web/live/ingestion_live_view/extract_steps/extract_http_step_form_test.exs
index 021c376cf..093d475c1 100644
--- a/apps/andi/test/integration/andi_web/live/ingestion_live_view/extract_steps/extract_http_step_form_test.exs
+++ b/apps/andi/test/integration/andi_web/live/ingestion_live_view/extract_steps/extract_http_step_form_test.exs
@@ -250,6 +250,7 @@ defmodule AndiWeb.ExtractHttpStepFormTest do
           "secret",
           %{
             destination: "secret",
+            value: "value",
             key: "secret1-key",
             sub_key: "secret1-sub-key"
           }
@@ -260,6 +261,7 @@ defmodule AndiWeb.ExtractHttpStepFormTest do
           "secret",
           %{
             destination: "secret2",
+            value: "value",
             key: "secret2-key",
             sub_key: "secret2-sub-key"
           }
diff --git a/apps/andi/test/unit/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form_test.exs b/apps/andi/test/unit/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form_test.exs
index 19f449e25..38a98e711 100644
--- a/apps/andi/test/unit/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form_test.exs
+++ b/apps/andi/test/unit/andi_web/live/ingestion_live_view/extract_steps/extract_secret_step_form_test.exs
@@ -29,6 +29,7 @@ defmodule AndiWeb.ExtractSecretFormTest do
 
       default_context = %{
         destination: "bob_field",
+        secret_value: "value",
         sub_key: "secret-key"
       }