diff --git a/app/views/form/headers/_person_2_known_page.erb b/app/views/form/headers/_person_2_known_page.erb
index 197750515..e305e36f4 100644
--- a/app/views/form/headers/_person_2_known_page.erb
+++ b/app/views/form/headers/_person_2_known_page.erb
@@ -1 +1 @@
-You have given us the details for 1 of the <%= hholdcount %> other people in the household
+You have given us the details for 1 of the <%= log.hholdcount %> other people in the household
diff --git a/app/views/form/headers/_person_3_known_page.erb b/app/views/form/headers/_person_3_known_page.erb
index 7f2b33ee2..2fd31a963 100644
--- a/app/views/form/headers/_person_3_known_page.erb
+++ b/app/views/form/headers/_person_3_known_page.erb
@@ -1 +1 @@
-You have given us the details for 2 of the <%= hholdcount %> other people in the household
+You have given us the details for 2 of the <%= log.hholdcount %> other people in the household
diff --git a/app/views/form/headers/_person_4_known_page.erb b/app/views/form/headers/_person_4_known_page.erb
index 3c9ec278e..b96949344 100644
--- a/app/views/form/headers/_person_4_known_page.erb
+++ b/app/views/form/headers/_person_4_known_page.erb
@@ -1 +1 @@
-You have given us the details for 3 of the <%= hholdcount %> other people in the household
+You have given us the details for 3 of the <%= log.hholdcount %> other people in the household
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 5b600bfac..da56e1001 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -17,9 +17,10 @@
             <span class="govuk-caption-l"><%= @subsection.label %></span>
           <% end %>
           <% if @page.header_partial.present? %>
-            <% @page.header = render partial: "form/headers/#{@page.header_partial}", locals: { hholdcount: @log.hholdcount } %>
+            <%= render partial: "form/headers/#{@page.header_partial}", locals: { log: @log} %>
+          <% else %>
+            <%= @page.header %>
           <% end %>
-          <%= @page.header %>
         </h1>
       <% end %>
 
@@ -35,7 +36,7 @@
           <% if question.type == "interruption_screen" %>
             <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, lettings_log: @log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f:, conditional: false } %>
           <% else %>
-            <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, lettings_log: @log, f:, conditional: false } %>
+            <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @page.header_partial.present? ? nil : @subsection.label, page_header: @page.header, lettings_log: @log, f:, conditional: false } %>
           <% end %>
         </div>
       <% end %>
diff --git a/db/schema.rb b/db/schema.rb
index 5cd425b01..43fc94775 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -359,9 +359,6 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_19_082625) do
     t.integer "hholdcount"
     t.integer "age3"
     t.integer "age3_known"
-    t.integer "details_known_2"
-    t.integer "details_known_3"
-    t.integer "details_known_4"
     t.integer "age4"
     t.integer "age4_known"
     t.integer "age5"
@@ -372,6 +369,9 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_19_082625) do
     t.integer "la_known"
     t.integer "income1"
     t.integer "income1nk"
+    t.integer "details_known_2"
+    t.integer "details_known_3"
+    t.integer "details_known_4"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"