diff --git a/app/views/layouts/_feedback.html.erb b/app/views/layouts/_feedback.html.erb
index 80af85661..7ef2c0b10 100644
--- a/app/views/layouts/_feedback.html.erb
+++ b/app/views/layouts/_feedback.html.erb
@@ -10,7 +10,7 @@
           </div>
         </div>
         <div class="gem-c-feedback__prompt-questions">
-          <a class="govuk-button gem-c-feedback__prompt-link" target="_blank" href="https://forms.office.com/e/thT1Vm7edm">
+          <a class="govuk-button gem-c-feedback__prompt-link" target="_blank" href="<%= I18n.t("feedback_form") %>">
             Give feedback (opens in a new tab)
           </a>
         </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 843d1da8b..29866fbfe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -31,7 +31,7 @@
 
 en:
   service_name: "Submit social housing lettings and sales data (CORE)"
-  feedback_form: "https://forms.office.com/e/thT1Vm7edm"
+  feedback_form: "https://forms.cloud.microsoft/Pages/ResponsePage.aspx?id=EGg0v32c3kOociSi7zmVqH_EURPnoZhLtbsnFZn-HdpUMEw2M04xWDc2QVNPNTBCMjQ1WDE0UU9HUi4u"
   organisation:
     created: "%{organisation} was created."
     updated: "Organisation details updated."
diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb
index e1e7e87ea..b0a658c7e 100644
--- a/spec/requests/sales_logs_controller_spec.rb
+++ b/spec/requests/sales_logs_controller_spec.rb
@@ -915,6 +915,16 @@ RSpec.describe SalesLogsController, type: :request do
       end
 
       context "with sales logs from a closed previous collection period" do
+        # These examples need logs in the archived collection year,
+        # so we have to enforce we are in the crossover period
+        around do |example|
+          Timecop.freeze(current_collection_start_date) do
+            Singleton.__init__(FormHandler)
+            example.run
+          end
+          Singleton.__init__(FormHandler)
+        end
+
         let(:completed_sales_log) do
           FactoryBot.create(
             :sales_log,