diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b4432bbd5..ccc93fd47 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -29,7 +29,10 @@
       <% header.with_product_name(name: service_name) %>
 
       <% if current_user %>
-        <% header.with_navigation_item(text: t(".your_account"), href: account_path) %>
+        <%# header.with_navigation_item(text: t(".your_account"), href: account_path) %>
+        <% if current_user.support_user? && current_service == :placements %>
+          <%= render "placements/support/header_navigation", header: %>
+        <% end %>
         <% header.with_navigation_item(text: t(".sign_out"), href: sign_out_path) %>
       <% end %>
     <% end %>
diff --git a/app/views/placements/support/_header_navigation.html.erb b/app/views/placements/support/_header_navigation.html.erb
new file mode 100644
index 000000000..32f5d9239
--- /dev/null
+++ b/app/views/placements/support/_header_navigation.html.erb
@@ -0,0 +1,5 @@
+<%# locals: (header:) %>
+
+<% header.with_navigation_item(text: t(".organisations"), href: support_organisations_path, active: false) %>
+<% header.with_navigation_item(text: t(".users"), href: support_support_users_path, active: false) %>
+<% header.with_navigation_item(text: t(".settings"), href: placements_support_settings_path, active: false) %>
diff --git a/app/views/placements/support/mailers/index.html.erb b/app/views/placements/support/mailers/index.html.erb
index b8abf21b4..928f868a5 100644
--- a/app/views/placements/support/mailers/index.html.erb
+++ b/app/views/placements/support/mailers/index.html.erb
@@ -1,5 +1,3 @@
-<% render "placements/support/primary_navigation", current_navigation: :settings %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_settings_path) %>
 <% end %>
diff --git a/app/views/placements/support/organisations/add_organisation/edit.html.erb b/app/views/placements/support/organisations/add_organisation/edit.html.erb
index 384580057..f40946f20 100644
--- a/app/views/placements/support/organisations/add_organisation/edit.html.erb
+++ b/app/views/placements/support/organisations/add_organisation/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/organisations/index.html.erb b/app/views/placements/support/organisations/index.html.erb
index 3f5a8ec23..ddc2d03cd 100644
--- a/app/views/placements/support/organisations/index.html.erb
+++ b/app/views/placements/support/organisations/index.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, t(".title", organisation_count: @pagy.count) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <div class="govuk-width-container" data-controller="filter">
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/placements/support/providers/new.html.erb b/app/views/placements/support/providers/new.html.erb
index b97e4a594..79a41e353 100644
--- a/app/views/placements/support/providers/new.html.erb
+++ b/app/views/placements/support/providers/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title, @provider_form.errors.any? ? t(".title_with_error") : t(".title") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_organisation_path) %>
 <% end %>
diff --git a/app/views/placements/support/providers/partner_schools/add_partner_school/edit.html.erb b/app/views/placements/support/providers/partner_schools/add_partner_school/edit.html.erb
index 702be9f5e..ae04267fc 100644
--- a/app/views/placements/support/providers/partner_schools/add_partner_school/edit.html.erb
+++ b/app/views/placements/support/providers/partner_schools/add_partner_school/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/providers/partner_schools/index.html.erb b/app/views/placements/support/providers/partner_schools/index.html.erb
index 1a481b7d0..8d0040a19 100644
--- a/app/views/placements/support/providers/partner_schools/index.html.erb
+++ b/app/views/placements/support/providers/partner_schools/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@provider.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/providers/partner_schools/remove.html.erb b/app/views/placements/support/providers/partner_schools/remove.html.erb
index 233af0397..97e448629 100644
--- a/app/views/placements/support/providers/partner_schools/remove.html.erb
+++ b/app/views/placements/support/providers/partner_schools/remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", provider_name: @provider.name, school_name: @partner_school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_partner_school_path(@provider, @partner_school)) %>
 <% end %>
diff --git a/app/views/placements/support/providers/partner_schools/show.html.erb b/app/views/placements/support/providers/partner_schools/show.html.erb
index a0bac9f27..19de45650 100644
--- a/app/views/placements/support/providers/partner_schools/show.html.erb
+++ b/app/views/placements/support/providers/partner_schools/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", partner_school_name: @partner_school.name, provider_name: @provider.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_partner_schools_path) %>
 <% end %>
diff --git a/app/views/placements/support/providers/provider_options.html.erb b/app/views/placements/support/providers/provider_options.html.erb
index cd94aa8f1..276aa45ae 100644
--- a/app/views/placements/support/providers/provider_options.html.erb
+++ b/app/views/placements/support/providers/provider_options.html.erb
@@ -3,7 +3,7 @@
 <% else %>
   <% content_for :page_title, t(".title", provider_count: providers.count, search_param:) %>
 <% end %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_provider_path) %>
 <% end %>
diff --git a/app/views/placements/support/providers/show.html.erb b/app/views/placements/support/providers/show.html.erb
index 6479b3a46..7dc1d6934 100644
--- a/app/views/placements/support/providers/show.html.erb
+++ b/app/views/placements/support/providers/show.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@provider.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/providers/users/add_user/edit.html.erb b/app/views/placements/support/providers/users/add_user/edit.html.erb
index 8871abd3d..47791f61d 100644
--- a/app/views/placements/support/providers/users/add_user/edit.html.erb
+++ b/app/views/placements/support/providers/users/add_user/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/providers/users/index.html.erb b/app/views/placements/support/providers/users/index.html.erb
index a3b3522d3..34d2f4134 100644
--- a/app/views/placements/support/providers/users/index.html.erb
+++ b/app/views/placements/support/providers/users/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@provider.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/providers/users/remove.html.erb b/app/views/placements/support/providers/users/remove.html.erb
index 03591774c..c38e83938 100644
--- a/app/views/placements/support/providers/users/remove.html.erb
+++ b/app/views/placements/support/providers/users/remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @user.full_name, organisation_name: @organisation.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_user_path(@organisation, @user)) %>
 <% end %>
diff --git a/app/views/placements/support/providers/users/show.html.erb b/app/views/placements/support/providers/users/show.html.erb
index 989d3be90..f431e0231 100644
--- a/app/views/placements/support/providers/users/show.html.erb
+++ b/app/views/placements/support/providers/users/show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize("#{@user.full_name} - #{@provider.name}") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_provider_users_path(@provider)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/mentors/add_mentor/edit.html.erb b/app/views/placements/support/schools/mentors/add_mentor/edit.html.erb
index 63b6be736..66eefb43f 100644
--- a/app/views/placements/support/schools/mentors/add_mentor/edit.html.erb
+++ b/app/views/placements/support/schools/mentors/add_mentor/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/mentors/can_not_remove.html.erb b/app/views/placements/support/schools/mentors/can_not_remove.html.erb
index 39377ddc1..1dfba43b0 100644
--- a/app/views/placements/support/schools/mentors/can_not_remove.html.erb
+++ b/app/views/placements/support/schools/mentors/can_not_remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @mentor.full_name, school_name: @school.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_mentor_path(school_id: @school.id, id: @mentor.id)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/mentors/confirm_remove.html.erb b/app/views/placements/support/schools/mentors/confirm_remove.html.erb
index fdade0c45..85bd87c5f 100644
--- a/app/views/placements/support/schools/mentors/confirm_remove.html.erb
+++ b/app/views/placements/support/schools/mentors/confirm_remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @mentor.full_name, school_name: @school.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_mentor_path(school_id: @school.id, id: @mentor.id)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/mentors/index.html.erb b/app/views/placements/support/schools/mentors/index.html.erb
index 7c0aa396c..19bd5af64 100644
--- a/app/views/placements/support/schools/mentors/index.html.erb
+++ b/app/views/placements/support/schools/mentors/index.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(@school.name) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <div class="govuk-width-container">
   <h1 class="govuk-heading-l"><%= @school.name %></h1>
 
diff --git a/app/views/placements/support/schools/mentors/show.html.erb b/app/views/placements/support/schools/mentors/show.html.erb
index 66c8162e3..4d7e5903a 100644
--- a/app/views/placements/support/schools/mentors/show.html.erb
+++ b/app/views/placements/support/schools/mentors/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", mentor_name: @mentor.full_name, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_mentors_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/new.html.erb b/app/views/placements/support/schools/new.html.erb
index 01fd199c4..7f35c874e 100644
--- a/app/views/placements/support/schools/new.html.erb
+++ b/app/views/placements/support/schools/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title, @school_form.errors.any? ? t(".title_with_error") : t(".title") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_organisation_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/partner_providers/add_partner_provider/edit.html.erb b/app/views/placements/support/schools/partner_providers/add_partner_provider/edit.html.erb
index 901fd4960..f5bf292f9 100644
--- a/app/views/placements/support/schools/partner_providers/add_partner_provider/edit.html.erb
+++ b/app/views/placements/support/schools/partner_providers/add_partner_provider/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/partner_providers/index.html.erb b/app/views/placements/support/schools/partner_providers/index.html.erb
index ae65ba9ab..78dffeff8 100644
--- a/app/views/placements/support/schools/partner_providers/index.html.erb
+++ b/app/views/placements/support/schools/partner_providers/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@school.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/schools/partner_providers/remove.html.erb b/app/views/placements/support/schools/partner_providers/remove.html.erb
index 5402590af..64d51d977 100644
--- a/app/views/placements/support/schools/partner_providers/remove.html.erb
+++ b/app/views/placements/support/schools/partner_providers/remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", provider_name: @partner_provider.name, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_partner_provider_path(@school, @partner_provider)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/partner_providers/show.html.erb b/app/views/placements/support/schools/partner_providers/show.html.erb
index 5ebd783f8..00720c810 100644
--- a/app/views/placements/support/schools/partner_providers/show.html.erb
+++ b/app/views/placements/support/schools/partner_providers/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", partner_provider_name: @partner_provider.name, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_partner_providers_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/placements/add_placement/edit.html.erb b/app/views/placements/support/schools/placements/add_placement/edit.html.erb
index bbcfeff8a..8700e02c8 100644
--- a/app/views/placements/support/schools/placements/add_placement/edit.html.erb
+++ b/app/views/placements/support/schools/placements/add_placement/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/placements/can_not_remove.html.erb b/app/views/placements/support/schools/placements/can_not_remove.html.erb
index 4553e1b35..25f70255a 100644
--- a/app/views/placements/support/schools/placements/can_not_remove.html.erb
+++ b/app/views/placements/support/schools/placements/can_not_remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", subject_names: @placement.title, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_placement_path(@school, @placement)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/placements/confirm_remove.html.erb b/app/views/placements/support/schools/placements/confirm_remove.html.erb
index 4667f2f61..69d325eaa 100644
--- a/app/views/placements/support/schools/placements/confirm_remove.html.erb
+++ b/app/views/placements/support/schools/placements/confirm_remove.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", subject_names: @placement.title, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_placement_path(@school, @placement)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/placements/edit_placement/edit.html.erb b/app/views/placements/support/schools/placements/edit_placement/edit.html.erb
index a2139d441..1914262b8 100644
--- a/app/views/placements/support/schools/placements/edit_placement/edit.html.erb
+++ b/app/views/placements/support/schools/placements/edit_placement/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/placements/index.html.erb b/app/views/placements/support/schools/placements/index.html.erb
index b9061e085..db0eaed73 100644
--- a/app/views/placements/support/schools/placements/index.html.erb
+++ b/app/views/placements/support/schools/placements/index.html.erb
@@ -1,5 +1,5 @@
 <% content_for :page_title, t(".page_title") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <div class="govuk-width-container">
   <h1 class="govuk-heading-l"><%= @school.name %></h1>
 
diff --git a/app/views/placements/support/schools/placements/show.html.erb b/app/views/placements/support/schools/placements/show.html.erb
index 5058ec603..237da1fb0 100644
--- a/app/views/placements/support/schools/placements/show.html.erb
+++ b/app/views/placements/support/schools/placements/show.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", placement_name: @placement.title, school_name: @school.name)) %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_placements_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/school_options.html.erb b/app/views/placements/support/schools/school_options.html.erb
index fe854a91e..5eae2fb4c 100644
--- a/app/views/placements/support/schools/school_options.html.erb
+++ b/app/views/placements/support/schools/school_options.html.erb
@@ -4,7 +4,6 @@
   <% content_for :page_title, t(".title", school_count: schools.count, search_param:) %>
 <% end %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: new_placements_support_school_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/show.html.erb b/app/views/placements/support/schools/show.html.erb
index d15b5a9a3..0b9d86a98 100644
--- a/app/views/placements/support/schools/show.html.erb
+++ b/app/views/placements/support/schools/show.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@school.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/schools/users/add_user/edit.html.erb b/app/views/placements/support/schools/users/add_user/edit.html.erb
index f391aa843..5f7e24f2f 100644
--- a/app/views/placements/support/schools/users/add_user/edit.html.erb
+++ b/app/views/placements/support/schools/users/add_user/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/schools/users/index.html.erb b/app/views/placements/support/schools/users/index.html.erb
index c9bee7b08..0a41bae9b 100644
--- a/app/views/placements/support/schools/users/index.html.erb
+++ b/app/views/placements/support/schools/users/index.html.erb
@@ -1,5 +1,4 @@
 <%= content_for :page_title, sanitize(@school.name) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/schools/users/remove.html.erb b/app/views/placements/support/schools/users/remove.html.erb
index b1ed86a77..1840c31dc 100644
--- a/app/views/placements/support/schools/users/remove.html.erb
+++ b/app/views/placements/support/schools/users/remove.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize(t(".page_title", user_name: @user.full_name, organisation_name: @organisation.name)) %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_user_path(@organisation, @user)) %>
 <% end %>
diff --git a/app/views/placements/support/schools/users/show.html.erb b/app/views/placements/support/schools/users/show.html.erb
index eacd625ef..a82206119 100644
--- a/app/views/placements/support/schools/users/show.html.erb
+++ b/app/views/placements/support/schools/users/show.html.erb
@@ -1,5 +1,5 @@
 <%= content_for :page_title, sanitize("#{@user.full_name} - #{@school.name}") %>
-<%= render "placements/support/primary_navigation", current_navigation: :organisations %>
+
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_school_users_path(@school)) %>
 <% end %>
diff --git a/app/views/placements/support/settings/index.html.erb b/app/views/placements/support/settings/index.html.erb
index f48569bf9..c77b3b96b 100644
--- a/app/views/placements/support/settings/index.html.erb
+++ b/app/views/placements/support/settings/index.html.erb
@@ -1,5 +1,4 @@
 <%# content_for :page_title, t(".heading", records: @pagy.count) %>
-<%= render "placements/support/primary_navigation", current_navigation: :settings %>
 
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/app/views/placements/support/support_users/add_support_user/edit.html.erb b/app/views/placements/support/support_users/add_support_user/edit.html.erb
index a0845d07d..1aef3e12c 100644
--- a/app/views/placements/support/support_users/add_support_user/edit.html.erb
+++ b/app/views/placements/support/support_users/add_support_user/edit.html.erb
@@ -1,5 +1,3 @@
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: back_link_path) %>
 <% end %>
diff --git a/app/views/placements/support/support_users/index.html.erb b/app/views/placements/support/support_users/index.html.erb
index b007b1443..ebae194d3 100644
--- a/app/views/placements/support/support_users/index.html.erb
+++ b/app/views/placements/support/support_users/index.html.erb
@@ -1,5 +1,4 @@
 <% content_for(:page_title) { t(".page_title") } %>
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
 
 <div class="govuk-width-container">
   <h1 class="govuk-heading-l"><%= t(".heading") %></h1>
diff --git a/app/views/placements/support/support_users/remove.html.erb b/app/views/placements/support/support_users/remove.html.erb
index 5239f8172..4888d7d91 100644
--- a/app/views/placements/support/support_users/remove.html.erb
+++ b/app/views/placements/support/support_users/remove.html.erb
@@ -1,7 +1,5 @@
 <% content_for(:page_title) { t(".page_title", user_name: @support_user.full_name) } %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
-
 <%= content_for(:before_content) do %>
   <%= govuk_back_link(href: placements_support_support_user_path(@support_user)) %>
 <% end %>
diff --git a/app/views/placements/support/support_users/show.html.erb b/app/views/placements/support/support_users/show.html.erb
index d041c7dba..cd96cbd63 100644
--- a/app/views/placements/support/support_users/show.html.erb
+++ b/app/views/placements/support/support_users/show.html.erb
@@ -1,7 +1,5 @@
 <% content_for(:page_title) { @support_user.full_name } %>
 
-<%= render "placements/support/primary_navigation", current_navigation: :users %>
-
 <% content_for(:before_content) do %>
   <%= govuk_back_link href: placements_support_support_users_path %>
 <% end %>
diff --git a/config/locales/en/placements/support/header_navigation.yml b/config/locales/en/placements/support/header_navigation.yml
new file mode 100644
index 000000000..8a8642545
--- /dev/null
+++ b/config/locales/en/placements/support/header_navigation.yml
@@ -0,0 +1,7 @@
+en:
+  placements:
+    support:
+      header_navigation:
+        users: Support users
+        organisations: Organisations
+        settings: Settings
\ No newline at end of file
diff --git a/spec/system/placements/support/organisations/support_filtering_and_searching_for_organisation_spec.rb b/spec/system/placements/support/organisations/support_filtering_and_searching_for_organisation_spec.rb
index 8f729c90e..852992d7d 100644
--- a/spec/system/placements/support/organisations/support_filtering_and_searching_for_organisation_spec.rb
+++ b/spec/system/placements/support/organisations/support_filtering_and_searching_for_organisation_spec.rb
@@ -191,9 +191,9 @@ def given_i_am_signed_in_as_a_support_user
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/organisations/support_user_selects_an_organisation_type_to_add_spec.rb b/spec/system/placements/support/organisations/support_user_selects_an_organisation_type_to_add_spec.rb
index 50d025ca2..00734407e 100644
--- a/spec/system/placements/support/organisations/support_user_selects_an_organisation_type_to_add_spec.rb
+++ b/spec/system/placements/support/organisations/support_user_selects_an_organisation_type_to_add_spec.rb
@@ -55,9 +55,9 @@ def when_i_click_add_organisation
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_spec.rb b/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_spec.rb
index 31cb42b85..38129fc6e 100644
--- a/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_spec.rb
+++ b/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_spec.rb
@@ -95,9 +95,9 @@ def when_i_visit_the_partner_schools_page_for(provider)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_without_javascript_spec.rb b/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_without_javascript_spec.rb
index 952e951f6..3b2f0f68d 100644
--- a/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_without_javascript_spec.rb
+++ b/spec/system/placements/support/providers/partner_schools/support_user_adds_a_partner_school_without_javascript_spec.rb
@@ -113,9 +113,9 @@ def when_i_visit_the_add_partner_school_page_for(provider)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/partner_schools/support_user_deletes_a_partner_school_spec.rb b/spec/system/placements/support/providers/partner_schools/support_user_deletes_a_partner_school_spec.rb
index 82581e660..0f4e0f227 100644
--- a/spec/system/placements/support/providers/partner_schools/support_user_deletes_a_partner_school_spec.rb
+++ b/spec/system/placements/support/providers/partner_schools/support_user_deletes_a_partner_school_spec.rb
@@ -100,9 +100,9 @@ def when_i_visit_the_partner_schools_page_for(provider:, school:)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/partner_schools/view_a_partner_school_as_support_user_spec.rb b/spec/system/placements/support/providers/partner_schools/view_a_partner_school_as_support_user_spec.rb
index 824666264..8872a2dad 100644
--- a/spec/system/placements/support/providers/partner_schools/view_a_partner_school_as_support_user_spec.rb
+++ b/spec/system/placements/support/providers/partner_schools/view_a_partner_school_as_support_user_spec.rb
@@ -55,9 +55,9 @@ def then_i_see_the_details_for(school)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/partner_schools/view_partner_school_list_as_support_user_spec.rb b/spec/system/placements/support/providers/partner_schools/view_partner_school_list_as_support_user_spec.rb
index 284344ca3..e6328802e 100644
--- a/spec/system/placements/support/providers/partner_schools/view_partner_school_list_as_support_user_spec.rb
+++ b/spec/system/placements/support/providers/partner_schools/view_partner_school_list_as_support_user_spec.rb
@@ -60,9 +60,9 @@ def and_i_cannot_see_partner_school(school)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/support_user_adds_a_provider_spec.rb b/spec/system/placements/support/providers/support_user_adds_a_provider_spec.rb
index 43d60aad9..b2a766313 100644
--- a/spec/system/placements/support/providers/support_user_adds_a_provider_spec.rb
+++ b/spec/system/placements/support/providers/support_user_adds_a_provider_spec.rb
@@ -85,9 +85,9 @@ def when_i_visit_the_add_organisation_page
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/providers/support_user_adds_a_provider_without_javascript_spec.rb b/spec/system/placements/support/providers/support_user_adds_a_provider_without_javascript_spec.rb
index c5d60ac27..8f52079aa 100644
--- a/spec/system/placements/support/providers/support_user_adds_a_provider_without_javascript_spec.rb
+++ b/spec/system/placements/support/providers/support_user_adds_a_provider_without_javascript_spec.rb
@@ -105,9 +105,9 @@ def when_i_visit_the_add_organisation_page
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/mentors/support_user_adds_a_mentor_spec.rb b/spec/system/placements/support/schools/mentors/support_user_adds_a_mentor_spec.rb
index 36b51af34..96556383f 100644
--- a/spec/system/placements/support/schools/mentors/support_user_adds_a_mentor_spec.rb
+++ b/spec/system/placements/support/schools/mentors/support_user_adds_a_mentor_spec.rb
@@ -214,9 +214,9 @@ def then_i_see_check_page_for(mentor)
   end
 
   def expect_organisations_to_be_selected_in_primary_navigation
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/mentors/support_user_deletes_a_mentor_spec.rb b/spec/system/placements/support/schools/mentors/support_user_deletes_a_mentor_spec.rb
index b87e698df..f9936c4af 100644
--- a/spec/system/placements/support/schools/mentors/support_user_deletes_a_mentor_spec.rb
+++ b/spec/system/placements/support/schools/mentors/support_user_deletes_a_mentor_spec.rb
@@ -90,9 +90,9 @@ def then_i_am_asked_to_confirm(school, mentor)
   end
 
   def organisations_is_selected_in_primary_nav
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_spec.rb b/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_spec.rb
index 1119f789b..f547258a8 100644
--- a/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_spec.rb
+++ b/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_spec.rb
@@ -175,9 +175,9 @@ def then_i_see_the_search_input_pre_filled_with(provider_name)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_without_javascript_spec.rb b/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_without_javascript_spec.rb
index 4c932c9f4..62e063e23 100644
--- a/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_without_javascript_spec.rb
+++ b/spec/system/placements/support/schools/partner_providers/support_user_adds_a_partner_provider_without_javascript_spec.rb
@@ -113,9 +113,9 @@ def when_i_visit_the_add_partner_provider_page_for(school)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/partner_providers/support_user_deletes_a_partner_provider_spec.rb b/spec/system/placements/support/schools/partner_providers/support_user_deletes_a_partner_provider_spec.rb
index 9ec01d545..d22088fc1 100644
--- a/spec/system/placements/support/schools/partner_providers/support_user_deletes_a_partner_provider_spec.rb
+++ b/spec/system/placements/support/schools/partner_providers/support_user_deletes_a_partner_provider_spec.rb
@@ -122,9 +122,9 @@ def and_a_notification_email_is_not_sent_to(user)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/partner_providers/view_a_partner_provider_as_support_user_spec.rb b/spec/system/placements/support/schools/partner_providers/view_a_partner_provider_as_support_user_spec.rb
index 56dc392c9..c176cf133 100644
--- a/spec/system/placements/support/schools/partner_providers/view_a_partner_provider_as_support_user_spec.rb
+++ b/spec/system/placements/support/schools/partner_providers/view_a_partner_provider_as_support_user_spec.rb
@@ -39,9 +39,9 @@ def when_i_click_on(text)
   alias_method :and_i_click_on, :when_i_click_on
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/partner_providers/view_partner_school_list_as_support_user_spec.rb b/spec/system/placements/support/schools/partner_providers/view_partner_school_list_as_support_user_spec.rb
index 38e2d371a..2b2db851c 100644
--- a/spec/system/placements/support/schools/partner_providers/view_partner_school_list_as_support_user_spec.rb
+++ b/spec/system/placements/support/schools/partner_providers/view_partner_school_list_as_support_user_spec.rb
@@ -41,9 +41,9 @@ def when_i_visit_the_partner_providers_page_for(school)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/placements/support_user_deletes_a_placement_spec.rb b/spec/system/placements/support/schools/placements/support_user_deletes_a_placement_spec.rb
index 39dfa7019..bce906b40 100644
--- a/spec/system/placements/support/schools/placements/support_user_deletes_a_placement_spec.rb
+++ b/spec/system/placements/support/schools/placements/support_user_deletes_a_placement_spec.rb
@@ -77,9 +77,9 @@ def then_i_am_asked_to_confirm(school, placement)
   end
 
   def organisations_is_selected_in_primary_nav
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/support_user_adds_a_school_spec.rb b/spec/system/placements/support/schools/support_user_adds_a_school_spec.rb
index 2e4f69cb0..07fb6be01 100644
--- a/spec/system/placements/support/schools/support_user_adds_a_school_spec.rb
+++ b/spec/system/placements/support/schools/support_user_adds_a_school_spec.rb
@@ -90,9 +90,9 @@ def when_i_visit_the_add_organisation_page
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/support_user_adds_a_school_without_javascript_spec.rb b/spec/system/placements/support/schools/support_user_adds_a_school_without_javascript_spec.rb
index 4a342301c..5e236a151 100644
--- a/spec/system/placements/support/schools/support_user_adds_a_school_without_javascript_spec.rb
+++ b/spec/system/placements/support/schools/support_user_adds_a_school_without_javascript_spec.rb
@@ -105,9 +105,9 @@ def when_i_visit_the_add_organisation_page
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/schools/view_school_as_support_user_spec.rb b/spec/system/placements/support/schools/view_school_as_support_user_spec.rb
index 196643142..4279095ca 100644
--- a/spec/system/placements/support/schools/view_school_as_support_user_spec.rb
+++ b/spec/system/placements/support/schools/view_school_as_support_user_spec.rb
@@ -47,7 +47,7 @@ def then_i_see_the_provider_details
   end
 
   def when_i_navigate_back_to_the_organisations_list
-    within(".app-primary-navigation__list") do
+    within(".govuk-header__navigation-list") do
       click_on "Organisations"
     end
   end
diff --git a/spec/system/placements/support/support_users/support_user_adds_a_support_user_spec.rb b/spec/system/placements/support/support_users/support_user_adds_a_support_user_spec.rb
index 7276371b8..279801f27 100644
--- a/spec/system/placements/support/support_users/support_user_adds_a_support_user_spec.rb
+++ b/spec/system/placements/support/support_users/support_user_adds_a_support_user_spec.rb
@@ -66,7 +66,7 @@ def when_i_sign_in_as_a_support_user(support_user)
   end
 
   def and_i_visit_the_support_users_page
-    within(".app-primary-navigation nav") do
+    within(".govuk-header__navigation-list") do
       click_on "Support users"
     end
   end
diff --git a/spec/system/placements/support/support_users/support_user_re_adds_a_discarded_support_user_spec.rb b/spec/system/placements/support/support_users/support_user_re_adds_a_discarded_support_user_spec.rb
index 19147e445..33a1709dd 100644
--- a/spec/system/placements/support/support_users/support_user_re_adds_a_discarded_support_user_spec.rb
+++ b/spec/system/placements/support/support_users/support_user_re_adds_a_discarded_support_user_spec.rb
@@ -91,7 +91,7 @@ def when_i_sign_in_as_a_support_user(support_user)
   end
 
   def and_i_visit_the_support_users_page
-    within(".app-primary-navigation nav") do
+    within(".govuk-header__navigation-list") do
       click_on "Support users"
     end
   end
diff --git a/spec/system/placements/support/support_users/support_user_removes_a_support_user_spec.rb b/spec/system/placements/support/support_users/support_user_removes_a_support_user_spec.rb
index 08b0c9fd8..411726e4a 100644
--- a/spec/system/placements/support/support_users/support_user_removes_a_support_user_spec.rb
+++ b/spec/system/placements/support/support_users/support_user_removes_a_support_user_spec.rb
@@ -39,7 +39,7 @@ def when_i_sign_in_as_a_support_user(support_user)
   end
 
   def and_i_visit_the_support_users_page
-    within(".app-primary-navigation nav") do
+    within(".govuk-header__navigation-list") do
       click_on "Support users"
     end
   end
diff --git a/spec/system/placements/support/support_users/support_user_views_a_support_user_spec.rb b/spec/system/placements/support/support_users/support_user_views_a_support_user_spec.rb
index fe1af401f..2cbc59cc2 100644
--- a/spec/system/placements/support/support_users/support_user_views_a_support_user_spec.rb
+++ b/spec/system/placements/support/support_users/support_user_views_a_support_user_spec.rb
@@ -19,7 +19,7 @@ def when_i_sign_in_as_a_support_user(support_user)
   end
 
   def and_i_visit_the_support_users_page
-    within(".app-primary-navigation nav") do
+    within(".govuk-header__navigation-list") do
       click_on "Support users"
     end
   end
diff --git a/spec/system/placements/support/support_users/support_user_views_support_users_spec.rb b/spec/system/placements/support/support_users/support_user_views_support_users_spec.rb
index 7a6352fbf..ff1b0a2c1 100644
--- a/spec/system/placements/support/support_users/support_user_views_support_users_spec.rb
+++ b/spec/system/placements/support/support_users/support_user_views_support_users_spec.rb
@@ -20,7 +20,7 @@ def when_i_sign_in_as_a_support_user(support_user)
   end
 
   def and_i_visit_the_support_users_page
-    within(".app-primary-navigation nav") do
+    within(".govuk-header__navigation-list") do
       click_on "Support users"
     end
   end
diff --git a/spec/system/placements/support/users/support_user_deletes_a_user_spec.rb b/spec/system/placements/support/users/support_user_deletes_a_user_spec.rb
index 420c3d5e6..61271aa48 100644
--- a/spec/system/placements/support/users/support_user_deletes_a_user_spec.rb
+++ b/spec/system/placements/support/users/support_user_deletes_a_user_spec.rb
@@ -116,9 +116,9 @@ def then_i_am_asked_to_confirm(organisation)
   end
 
   def organisations_is_selected_in_primary_nav
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 
diff --git a/spec/system/placements/support/users/support_user_invites_a_new_user_spec.rb b/spec/system/placements/support/users/support_user_invites_a_new_user_spec.rb
index d55441d78..2c868bde4 100644
--- a/spec/system/placements/support/users/support_user_invites_a_new_user_spec.rb
+++ b/spec/system/placements/support/users/support_user_invites_a_new_user_spec.rb
@@ -160,9 +160,9 @@ def and_i_enter_the_details_for_a_new_user
   end
 
   def then_i_see_the_navigation_bars_with_organisations_and_users_selected(organisation)
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
 
     within(".app-secondary-navigation") do
@@ -255,9 +255,9 @@ def then_i_see_an_error(error_message, error_index = 0)
   end
 
   def then_i_see_support_navigation_with_organisation_selected
-    within(".app-primary-navigation__nav") do
-      expect(page).to have_link "Organisations", current: "page"
-      expect(page).to have_link "Support users", current: "false"
+    within(".govuk-header__navigation-list") do
+      expect(page).to have_link "Organisations"
+      expect(page).to have_link "Support users"
     end
   end
 end