diff --git a/app/models/form/sales/pages/person1_gender_identity.rb b/app/models/form/sales/pages/person1_gender_identity.rb
index 3e6bde9bc..7cc62f4d3 100644
--- a/app/models/form/sales/pages/person1_gender_identity.rb
+++ b/app/models/form/sales/pages/person1_gender_identity.rb
@@ -12,7 +12,7 @@ class Form::Sales::Pages::Person1GenderIdentity < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::Person1GenderIdentity.new(nil, nil, self),
+      Form::Sales::Questions::Person1GenderIdentity.new("sex2", nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
index 4e9cca219..2ef9e249a 100644
--- a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
+++ b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
@@ -12,7 +12,7 @@ class Form::Sales::Pages::Person1GenderIdentityJointPurchase < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::Person1GenderIdentityJointPurchase.new(nil, nil, self),
+      Form::Sales::Questions::Person1GenderIdentity.new("sex3", nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/questions/person1_gender_identity.rb b/app/models/form/sales/questions/person1_gender_identity.rb
index 8cf8f29af..f525308f5 100644
--- a/app/models/form/sales/questions/person1_gender_identity.rb
+++ b/app/models/form/sales/questions/person1_gender_identity.rb
@@ -1,13 +1,12 @@
 class Form::Sales::Questions::Person1GenderIdentity < ::Form::Question
   def initialize(id, hsh, page)
     super
-    @id = "sex2"
     @check_answer_label = "Person 1’s gender identity"
     @header = "Which of these best describes Person 1’s gender identity?"
     @type = "radio"
     @page = page
     @answer_options = ANSWER_OPTIONS
-    @check_answers_card_number = 2
+    @check_answers_card_number = id == "sex2" ? 2 : 3
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb b/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb
deleted file mode 100644
index 1127bf313..000000000
--- a/app/models/form/sales/questions/person1_gender_identity_joint_purchase.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class Form::Sales::Questions::Person1GenderIdentityJointPurchase < ::Form::Question
-  def initialize(id, hsh, page)
-    super
-    @id = "sex3"
-    @check_answer_label = "Person 1’s gender identity"
-    @header = "Which of these best describes Person 1’s gender identity?"
-    @type = "radio"
-    @page = page
-    @answer_options = ANSWER_OPTIONS
-    @check_answers_card_number = 3
-  end
-
-  ANSWER_OPTIONS = {
-    "F" => { "value" => "Female" },
-    "M" => { "value" => "Male" },
-    "X" => { "value" => "Non-binary" },
-    "R" => { "value" => "Buyer prefers not to say" },
-  }.freeze
-end
diff --git a/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb
deleted file mode 100644
index d1d97ba3d..000000000
--- a/spec/models/form/sales/questions/person1_gender_identity_joint_purchase_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Form::Sales::Questions::Person1GenderIdentityJointPurchase, type: :model do
-  subject(:question) { described_class.new(question_id, question_definition, page) }
-
-  let(:question_id) { nil }
-  let(:question_definition) { nil }
-  let(:page) { instance_double(Form::Page) }
-
-  it "has correct page" do
-    expect(question.page).to eq(page)
-  end
-
-  it "has the correct id" do
-    expect(question.id).to eq("sex3")
-  end
-
-  it "has the correct header" do
-    expect(question.header).to eq("Which of these best describes Person 1’s gender identity?")
-  end
-
-  it "has the correct check_answer_label" do
-    expect(question.check_answer_label).to eq("Person 1’s gender identity")
-  end
-
-  it "has the correct type" do
-    expect(question.type).to eq("radio")
-  end
-
-  it "is not marked as derived" do
-    expect(question.derived?).to be false
-  end
-
-  it "has expected check answers card number" do
-    expect(question.check_answers_card_number).to eq(3)
-  end
-
-  it "has the correct answer_options" do
-    expect(question.answer_options).to eq({
-      "F" => { "value" => "Female" },
-      "M" => { "value" => "Male" },
-      "X" => { "value" => "Non-binary" },
-      "R" => { "value" => "Buyer prefers not to say" },
-    })
-  end
-end
diff --git a/spec/models/form/sales/questions/person1_gender_identity_spec.rb b/spec/models/form/sales/questions/person1_gender_identity_spec.rb
index 41adde38a..9a4bc67cf 100644
--- a/spec/models/form/sales/questions/person1_gender_identity_spec.rb
+++ b/spec/models/form/sales/questions/person1_gender_identity_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Form::Sales::Questions::Person1GenderIdentity, type: :model do
   subject(:question) { described_class.new(question_id, question_definition, page) }
 
-  let(:question_id) { nil }
+  let(:question_id) { "sex2" }
   let(:question_definition) { nil }
   let(:page) { instance_double(Form::Page) }