diff --git a/app/models/form.rb b/app/models/form.rb
index 179c56526..64836a396 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -4,10 +4,10 @@ class Form
               :setup_sections, :form_sections, :unresolved_log_redirect_page_id
 
   def initialize(form_path, start_year = "", sections_in_form = [], type = "lettings")
-    if type == "sales"
-      @setup_sections = [Form::Sales::Sections::Setup.new(nil, nil, self)]
+    if type == "sales" || (start_year && start_year.to_i > 2021)
+      @setup_sections = type == "sales" ? [Form::Sales::Sections::Setup.new(nil, nil, self)] : [Form::Lettings::Sections::Setup.new(nil, nil, self)]
       @form_sections = sections_in_form.map { |sec| sec.new(nil, nil, self) }
-      @type = "sales"
+      @type = type == "sales" ? "sales" : "lettings"
       @sections = setup_sections + form_sections
       @subsections = sections.flat_map(&:subsections)
       @pages = subsections.flat_map(&:pages)
diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb
index 51a0b6177..cb9536d9e 100644
--- a/app/models/form_handler.rb
+++ b/app/models/form_handler.rb
@@ -32,13 +32,22 @@ class FormHandler
   end
 
   def lettings_forms
-    forms = {}
+    lettings_forms = [
+      Form::Lettings::Sections::Household,
+      Form::Lettings::Sections::RentAndCharges,
+      Form::Lettings::Sections::TenancyAndProperty,
+    ]
+    current_form = Form.new(nil, current_collection_start_year, lettings_forms, "lettings")
+
+    forms = { "current_lettings" => current_form }
     directories.each do |directory|
       Dir.glob("#{directory}/*.json").each do |form_path|
         form = Form.new(form_path)
 
         form_to_set = form_name_from_start_year(form.start_date.year, "lettings")
-        forms[form_to_set] = form if forms[form_to_set].blank?
+        if form && form.start_date.year == 2021 && forms[form_to_set].blank?
+          forms[form_to_set] = form
+        end
       end
     end
     forms