diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 006bde6d2..f0edd1afb 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -40,12 +40,12 @@
       <%= f.hidden_field :page, value: @page.id %>
 
       <div class="govuk-button-group">
-        <% if !@page.id.include?("value_check") %>
+        <% if !@page.id.include?("value_check") && if request.query_parameters["referrer"] != "check_answers" %>
           <%= f.govuk_submit "Save and continue" %>
-          <% if request.query_parameters["referrer"] == "check_answers" %>
-            <%= govuk_link_to "Cancel", "/logs/#{@case_log.id}/setup/check-answers" %>
+          <%= govuk_link_to "Skip for now", send(@case_log.form.next_page_redirect_path(@page, @case_log, current_user), @case_log) %>
           <% else %>
-            <%= govuk_link_to "Skip for now", send(@case_log.form.next_page_redirect_path(@page, @case_log, current_user), @case_log) %>
+          <%= f.govuk_submit "Save changes" %>
+            <%= govuk_link_to "Cancel", "/logs/#{@case_log.id}/setup/check-answers" %>
           <% end %>
         <% end %>
       </div>
diff --git a/spec/features/form/check_answers_page_spec.rb b/spec/features/form/check_answers_page_spec.rb
index aab201137..f3b9418a2 100644
--- a/spec/features/form/check_answers_page_spec.rb
+++ b/spec/features/form/check_answers_page_spec.rb
@@ -136,7 +136,7 @@ RSpec.describe "Form Check Answers Page" do
         first("a", text: /Change/).click
         uncheck("case-log-accessibility-requirements-housingneeds-c-field")
         check("case-log-accessibility-requirements-housingneeds-b-field")
-        click_button("Save and continue")
+        click_button("Save changes")
         expect(page).to have_current_path("/logs/#{empty_case_log.id}/household-needs/check-answers")
       end
     end