diff --git a/app/controllers/events/public_registrations_controller.rb b/app/controllers/events/public_registrations_controller.rb
index ade7bfcec..d9dd62012 100644
--- a/app/controllers/events/public_registrations_controller.rb
+++ b/app/controllers/events/public_registrations_controller.rb
@@ -142,7 +142,7 @@ def validate_required_fields(form_params)
 
         if field.number_integer? && value.to_s !~ /\A\d+\z/
           errors[field.id] = "must be a whole number"
-        elsif field.field_key&.match?(/email(?!_type)/) && value.to_s !~ /\A[^@\s]+@[^@\s]+\z/
+        elsif field.field_key&.match?(/email(?!_type|_confirmation)/) && value.to_s !~ /\A[^@\s]+@[^@\s]+\z/
           errors[field.id] = "must be a valid email address"
         end
       end
diff --git a/app/services/base_registration_form_builder.rb b/app/services/base_registration_form_builder.rb
new file mode 100644
index 000000000..64c2b9ad8
--- /dev/null
+++ b/app/services/base_registration_form_builder.rb
@@ -0,0 +1,94 @@
+class BaseRegistrationFormBuilder
+  protected
+
+  def build_basic_contact_fields(form, position)
+    position = add_field(form, position, "First Name", :free_form_input_one_line,
+                         key: "first_name", group: "contact", required: true)
+    position = add_field(form, position, "Last Name", :free_form_input_one_line,
+                         key: "last_name", group: "contact", required: true)
+    position = add_field(form, position, "Email", :free_form_input_one_line,
+                         key: "primary_email", group: "contact", required: true)
+    position = add_field(form, position, "Confirm Email", :free_form_input_one_line,
+                         key: "confirm_email", group: "contact", required: true)
+
+    position
+  end
+
+  def build_scholarship_fields(form, position)
+    position = add_header(form, position, "Scholarship Application", group: "scholarship")
+
+    position = add_field(form, position,
+                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
+                         :multiple_choice_checkbox,
+                         key: "scholarship_eligibility", group: "scholarship", required: true,
+                         options: [ "Yes" ])
+    position = add_field(form, position,
+                         "How will what you gain from this training directly impact the people you serve?",
+                         :free_form_input_paragraph,
+                         key: "impact_description", group: "scholarship", required: true,
+                         hint: "Please describe in 3-5+ sentences.")
+    position = add_field(form, position,
+                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
+                         :free_form_input_paragraph,
+                         key: "implementation_plan", group: "scholarship", required: true,
+                         hint: "Please describe in 3-5+ sentences.")
+    position = add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
+                         key: "additional_comments", group: "scholarship", required: false)
+
+    position
+  end
+
+  def build_consent_fields(form, position)
+    position = add_header(form, position, "Consent", group: "consent")
+    position = add_field(form, position,
+                         "I agree to receive email communications from A Window Between Worlds.",
+                         :multiple_choice_radio,
+                         key: "communication_consent", group: "consent", required: true,
+                         hint: "By submitting this form, I consent to receive updates from A Window Between Worlds, " \
+                               "including information about this event as well as upcoming events, training opportunities, resources, " \
+                               "impact stories, and ways to support our mission. I understand I can unsubscribe at any time.",
+                         options: %w[Yes No])
+
+    position
+  end
+
+  def add_header(form, position, title, group:)
+    position += 1
+    form.form_fields.create!(
+      question: title,
+      answer_type: :group_header,
+      status: :active,
+      position: position,
+      is_required: false,
+      field_key: nil,
+      field_group: group
+    )
+    position
+  end
+
+  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil, datatype: nil)
+    position += 1
+    field = form.form_fields.create!(
+      question: question,
+      answer_type: answer_type,
+      answer_datatype: datatype,
+      status: :active,
+      position: position,
+      is_required: required,
+      instructional_hint: hint,
+      field_key: key,
+      field_group: group
+    )
+
+    if options.present?
+      options.each_with_index do |opt, idx|
+        ao = AnswerOption.find_or_create_by!(name: opt) do |a|
+          a.position = idx
+        end
+        field.form_field_answer_options.create!(answer_option: ao)
+      end
+    end
+
+    position
+  end
+end
diff --git a/app/services/event_registration_services/public_registration.rb b/app/services/event_registration_services/public_registration.rb
index af5b734e7..c681a75dd 100644
--- a/app/services/event_registration_services/public_registration.rb
+++ b/app/services/event_registration_services/public_registration.rb
@@ -123,7 +123,7 @@ def create_mailing_address(person)
         state: new_state,
         zip_code: field_value("mailing_zip"),
         locality: "Unknown",
-        address_type: "mailing",
+        address_type: field_value("mailing_address_type")&.downcase || "mailing",
         primary: true
       )
     end
@@ -252,6 +252,7 @@ def update_person_form(person)
     def save_form_fields(person_form)
       @form.form_fields.where(status: :active).find_each do |field|
         next if field.group_header?
+        next if field.field_key == "confirm_email"
 
         raw_value = @form_params[field.id.to_s]
         text = if raw_value.is_a?(Array)
diff --git a/app/services/extended_event_registration_form_builder.rb b/app/services/extended_event_registration_form_builder.rb
index 9a7e2678b..f6e093eac 100644
--- a/app/services/extended_event_registration_form_builder.rb
+++ b/app/services/extended_event_registration_form_builder.rb
@@ -1,4 +1,4 @@
-class ExtendedEventRegistrationFormBuilder
+class ExtendedEventRegistrationFormBuilder < BaseRegistrationFormBuilder
   FORM_NAME = "Extended Event Registration"
 
   def self.build_standalone!(include_contact_fields: true)
@@ -58,7 +58,8 @@ def build_fields!(form)
     position = build_professional_fields(form, position)
     position = build_qualitative_fields(form, position)
     position = build_scholarship_fields(form, position)
-    build_payment_fields(form, position)
+    position = build_payment_fields(form, position)
+    build_consent_fields(form, position)
 
     form
   end
@@ -68,19 +69,15 @@ def build_fields!(form)
   def build_contact_fields(form, position)
     position = add_header(form, position, "Contact Information", group: "contact")
 
-    position = add_field(form, position, "First Name", :free_form_input_one_line,
-                         key: "first_name", group: "contact", required: true)
-    position = add_field(form, position, "Last Name", :free_form_input_one_line,
-                         key: "last_name", group: "contact", required: true)
+    position = build_basic_contact_fields(form, position)
+
+    position = add_field(form, position, "Primary Email Type", :multiple_choice_radio,
+                         key: "primary_email_type", group: "contact", required: true,
+                         options: %w[Personal Work])
     position = add_field(form, position, "Preferred Nickname", :free_form_input_one_line,
                          key: "nickname", group: "contact", required: false)
     position = add_field(form, position, "Pronouns", :free_form_input_one_line,
                          key: "pronouns", group: "contact", required: false)
-    position = add_field(form, position, "Primary Email", :free_form_input_one_line,
-                         key: "primary_email", group: "contact", required: true)
-    position = add_field(form, position, "Primary Email Type", :multiple_choice_radio,
-                         key: "primary_email_type", group: "contact", required: true,
-                         options: %w[Personal Work])
     position = add_field(form, position, "Secondary Email", :free_form_input_one_line,
                          key: "secondary_email", group: "contact", required: false)
     position = add_field(form, position, "Secondary Email Type", :multiple_choice_radio,
@@ -90,15 +87,15 @@ def build_contact_fields(form, position)
     position = add_header(form, position, "Mailing Address", group: "contact")
     position = add_field(form, position, "Street Address", :free_form_input_one_line,
                          key: "mailing_street", group: "contact", required: true)
+    position = add_field(form, position, "Address Type", :multiple_choice_radio,
+                         key: "mailing_address_type", group: "contact", required: true,
+                         options: %w[Home Work])
     position = add_field(form, position, "City", :free_form_input_one_line,
                          key: "mailing_city", group: "contact", required: true)
     position = add_field(form, position, "State / Province", :free_form_input_one_line,
                          key: "mailing_state", group: "contact", required: true)
     position = add_field(form, position, "Zip / Postal Code", :free_form_input_one_line,
                          key: "mailing_zip", group: "contact", required: true)
-    position = add_field(form, position, "Mailing Address Type", :multiple_choice_radio,
-                         key: "mailing_address_type", group: "contact", required: true,
-                         options: %w[Work Personal])
 
     position = add_field(form, position, "Phone", :free_form_input_one_line,
                          key: "phone", group: "contact", required: true)
@@ -149,7 +146,7 @@ def build_professional_fields(form, position)
                          key: "primary_service_area", group: "professional", required: false,
                          hint: "Select all that apply. These represent the sectors you primarily serve.")
     position = add_field(form, position, "Workshop Settings", :multiple_choice_checkbox,
-                         key: "workshop_settings", group: "professional", required: false,
+                         key: "workshop_environments", group: "professional", required: false,
                          hint: "Select all settings where you facilitate or plan to facilitate workshops.",
                          options: [
                            "Clinical", "Educational", "Events / conferences",
@@ -182,30 +179,6 @@ def build_qualitative_fields(form, position)
     position
   end
 
-  def build_scholarship_fields(form, position)
-    position = add_header(form, position, "Scholarship Application", group: "scholarship")
-
-    position = add_field(form, position,
-                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
-                         :multiple_choice_checkbox,
-                         key: "scholarship_eligibility", group: "scholarship", required: true,
-                         options: [ "Yes" ])
-    position = add_field(form, position,
-                         "How will what you gain from this training directly impact the people you serve?",
-                         :free_form_input_paragraph,
-                         key: "impact_description", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position,
-                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
-                         :free_form_input_paragraph,
-                         key: "implementation_plan", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
-                         key: "additional_comments", group: "scholarship", required: false)
-
-    position
-  end
-
   def build_payment_fields(form, position)
     position = add_header(form, position, "Payment Information", group: "payment")
 
@@ -219,46 +192,4 @@ def build_payment_fields(form, position)
 
     position
   end
-
-  # --- helpers ---
-
-  def add_header(form, position, title, group:)
-    position += 1
-    form.form_fields.create!(
-      question: title,
-      answer_type: :group_header,
-      status: :active,
-      position: position,
-      is_required: false,
-      field_key: nil,
-      field_group: group
-    )
-    position
-  end
-
-  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil, datatype: nil)
-    position += 1
-    field = form.form_fields.create!(
-      question: question,
-      answer_type: answer_type,
-      answer_datatype: datatype,
-      status: :active,
-      position: position,
-      is_required: required,
-      instructional_hint: hint,
-      field_key: key,
-      field_group: group
-    )
-
-    if options.present?
-      options.each_with_index do |opt, idx|
-        ao = AnswerOption.find_or_create_by!(name: opt) do |a|
-          a.position = idx
-        end
-        field.form_field_answer_options.create!(answer_option: ao)
-      end
-    end
-
-    position
-  end
 end
diff --git a/app/services/scholarship_application_form_builder.rb b/app/services/scholarship_application_form_builder.rb
index 10331fc2a..b0e42c382 100644
--- a/app/services/scholarship_application_form_builder.rb
+++ b/app/services/scholarship_application_form_builder.rb
@@ -1,4 +1,4 @@
-class ScholarshipApplicationFormBuilder
+class ScholarshipApplicationFormBuilder < BaseRegistrationFormBuilder
   FORM_NAME = "Scholarship Application"
 
   def self.build_standalone!
@@ -15,67 +15,7 @@ def self.build!(event)
   end
 
   def build_fields!(form)
-    position = 0
-
-    position = add_header(form, position, "Scholarship Application", group: "scholarship")
-
-    position = add_field(form, position,
-                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
-                         :multiple_choice_checkbox,
-                         key: "scholarship_eligibility", group: "scholarship", required: true,
-                         options: [ "Yes" ])
-    position = add_field(form, position,
-                         "How will what you gain from this training directly impact the people you serve?",
-                         :free_form_input_paragraph,
-                         key: "impact_description", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position,
-                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
-                         :free_form_input_paragraph,
-                         key: "implementation_plan", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
-              key: "additional_comments", group: "scholarship", required: false)
-
+    build_scholarship_fields(form, 0)
     form
   end
-
-  private
-
-  def add_header(form, position, title, group:)
-    position += 1
-    form.form_fields.create!(
-      question: title,
-      answer_type: :group_header,
-      status: :active,
-      position: position,
-      is_required: false,
-      field_key: nil,
-      field_group: group
-    )
-    position
-  end
-
-  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil)
-    position += 1
-    field = form.form_fields.create!(
-      question: question,
-      answer_type: answer_type,
-      status: :active,
-      position: position,
-      is_required: required,
-      instructional_hint: hint,
-      field_key: key,
-      field_group: group
-    )
-
-    if options.present?
-      options.each_with_index do |opt, idx|
-        ao = AnswerOption.find_or_create_by!(name: opt) { |a| a.position = idx }
-        field.form_field_answer_options.create!(answer_option: ao)
-      end
-    end
-
-    position
-  end
 end
diff --git a/app/services/short_event_registration_form_builder.rb b/app/services/short_event_registration_form_builder.rb
index 7d5ec291f..900d4c6f9 100644
--- a/app/services/short_event_registration_form_builder.rb
+++ b/app/services/short_event_registration_form_builder.rb
@@ -1,4 +1,4 @@
-class ShortEventRegistrationFormBuilder
+class ShortEventRegistrationFormBuilder < BaseRegistrationFormBuilder
   FORM_NAME = "Short Event Registration"
 
   def self.build_standalone!
@@ -17,22 +17,17 @@ def self.build!(event)
   def build_fields!(form)
     position = 0
 
-    position = add_field(form, position, "First Name", :free_form_input_one_line,
-                         key: "first_name", group: "contact", required: true)
-    position = add_field(form, position, "Last Name", :free_form_input_one_line,
-                         key: "last_name", group: "contact", required: true)
-    position = add_field(form, position, "Enter Email", :free_form_input_one_line,
-                         key: "primary_email", group: "contact", required: true)
-    position = add_field(form, position, "Confirm Email", :free_form_input_one_line,
-                         key: "confirm_email", group: "contact", required: true)
+    position = build_basic_contact_fields(form, position)
+    position = build_consent_fields(form, position)
+    position = build_qualitative_fields(form, position)
+    position = build_scholarship_fields(form, position)
+
+    position
+  end
 
-    position = add_field(form, position, "Consent", :multiple_choice_checkbox,
-                         key: "consent", group: "consent", required: true,
-                         hint: "By submitting this form, I consent to receive updates from A Window Between Worlds, " \
-                               "including information about this event as well as upcoming events, training opportunities, resources, " \
-                               "impact stories, and ways to support our mission. I understand I can unsubscribe at any time.",
-                         options: [ "I agree to receive email communications from A Window Between Worlds." ])
+  private
 
+  def build_qualitative_fields(form, position)
     position = add_field(form, position, "How did you hear about this event?", :multiple_choice_checkbox,
                          key: "referral_source", group: "qualitative", required: true,
                          options: [ "AWBW Email", "Facebook", "Instagram", "LinkedIn", "Online Search", "Word of Mouth", "Other" ])
@@ -42,71 +37,6 @@ def build_fields!(form)
                          key: "training_interest", group: "qualitative", required: true,
                          options: [ "Yes", "Not right now" ])
 
-    position = build_scholarship_fields(form, position)
-
-    position
-  end
-
-  private
-
-  def build_scholarship_fields(form, position)
-    position = add_header(form, position, "Scholarship Application", group: "scholarship")
-
-    position = add_field(form, position,
-                         "I / my agency cannot afford the full training cost and need a scholarship to attend.",
-                         :multiple_choice_checkbox,
-                         key: "scholarship_eligibility", group: "scholarship", required: true,
-                         options: [ "Yes" ])
-    position = add_field(form, position,
-                         "How will what you gain from this training directly impact the people you serve?",
-                         :free_form_input_paragraph,
-                         key: "impact_description", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position,
-                         "Please describe one way in which you plan to use art workshops and how you envision it will help.",
-                         :free_form_input_paragraph,
-                         key: "implementation_plan", group: "scholarship", required: true,
-                         hint: "Please describe in 3-5+ sentences.")
-    position = add_field(form, position, "Anything else you'd like to share with us?", :free_form_input_paragraph,
-                         key: "additional_comments", group: "scholarship", required: false)
-
-    position
-  end
-
-  def add_header(form, position, title, group:)
-    position += 1
-    form.form_fields.create!(
-      question: title,
-      answer_type: :group_header,
-      status: :active,
-      position: position,
-      is_required: false,
-      field_key: nil,
-      field_group: group
-    )
-    position
-  end
-
-  def add_field(form, position, question, answer_type, key:, group:, required: true, hint: nil, options: nil)
-    position += 1
-    field = form.form_fields.create!(
-      question: question,
-      answer_type: answer_type,
-      status: :active,
-      position: position,
-      is_required: required,
-      instructional_hint: hint,
-      field_key: key,
-      field_group: group
-    )
-
-    if options.present?
-      options.each_with_index do |opt, idx|
-        ao = AnswerOption.find_or_create_by!(name: opt) { |a| a.position = idx }
-        field.form_field_answer_options.create!(answer_option: ao)
-      end
-    end
-
     position
   end
 end
diff --git a/app/views/events/public_registrations/_form_field.html.erb b/app/views/events/public_registrations/_form_field.html.erb
index d5fe9730f..9cf64881d 100644
--- a/app/views/events/public_registrations/_form_field.html.erb
+++ b/app/views/events/public_registrations/_form_field.html.erb
@@ -1,4 +1,4 @@
-<%# locals: (field:, value: nil) %>
+<%# locals: (field:, value: nil, label: nil) %>
 <% return if field.group_header? %>
 
 <% error = @field_errors&.dig(field.id) %>
@@ -6,7 +6,7 @@
 
 <div class="mb-5">
   <label class="block text-sm font-medium text-gray-700 mb-1" for="public_registration_form_fields_<%= field.id %>">
-    <%= field.question %>
+    <%= label || field.question %>
     <% if field.is_required %>
       <span class="text-red-500">*</span>
     <% end %>
diff --git a/app/views/events/public_registrations/new.html.erb b/app/views/events/public_registrations/new.html.erb
index 8d802542b..1b2750fe4 100644
--- a/app/views/events/public_registrations/new.html.erb
+++ b/app/views/events/public_registrations/new.html.erb
@@ -63,7 +63,9 @@
         <%# Row groupings: related fields share a grid row on md+ screens %>
         <%
           fields_by_key_check = @form_fields.select(&:field_key).index_by(&:field_key)
-          email_row = if fields_by_key_check["confirm_email"]
+          email_row = if fields_by_key_check["confirm_email"] && fields_by_key_check["primary_email_type"]
+            { keys: %w[primary_email confirm_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" }
+          elsif fields_by_key_check["confirm_email"]
             { keys: %w[primary_email confirm_email], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" }
           else
             { keys: %w[primary_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "primary_email" => "md:col-span-2" } }
@@ -74,6 +76,7 @@
             { keys: %w[nickname pronouns], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
             email_row,
             { keys: %w[secondary_email secondary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "secondary_email" => "md:col-span-2" } },
+            { keys: %w[mailing_street mailing_address_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
             { keys: %w[mailing_city mailing_state mailing_zip], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" },
             { keys: %w[phone phone_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
             { keys: %w[agency_name agency_position], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
@@ -86,6 +89,13 @@
 
           fields_by_key = @form_fields.select(&:field_key).index_by(&:field_key)
           rendered_keys = {}
+
+          has_secondary_email = fields_by_key["secondary_email"].present?
+          email_label_overrides = if has_secondary_email
+            { "primary_email" => "Primary Email", "confirm_email" => "Confirm Primary Email", "primary_email_type" => "Primary Email Type" }
+          else
+            {}
+          end
         %>
 
         <% @form_fields.each do |field| %>
@@ -103,12 +113,13 @@
                 <% rendered_keys[key] = true %>
                 <% span = group.dig(:spans, key) %>
                 <% submitted_value = params.dig(:public_registration, :form_fields, row_field.id.to_s) %>
+                <% label_override = email_label_overrides[key] %>
                 <% if span %>
                   <div class="<%= span %>">
-                    <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value %>
+                    <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value, label: label_override %>
                   </div>
                 <% else %>
-                  <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value %>
+                  <%= render "events/public_registrations/form_field", field: row_field, value: submitted_value, label: label_override %>
                 <% end %>
               <% end %>
             </div>
diff --git a/app/views/events/public_registrations/show.html.erb b/app/views/events/public_registrations/show.html.erb
index 94373ae41..b94b25005 100644
--- a/app/views/events/public_registrations/show.html.erb
+++ b/app/views/events/public_registrations/show.html.erb
@@ -32,6 +32,7 @@
           { keys: %w[nickname pronouns], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           { keys: %w[primary_email primary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "primary_email" => "md:col-span-2" } },
           { keys: %w[secondary_email secondary_email_type], grid: "grid grid-cols-1 md:grid-cols-3 gap-4", spans: { "secondary_email" => "md:col-span-2" } },
+          { keys: %w[mailing_street mailing_address_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           { keys: %w[mailing_city mailing_state mailing_zip], grid: "grid grid-cols-1 md:grid-cols-3 gap-4" },
           { keys: %w[phone phone_type], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
           { keys: %w[agency_name agency_position], grid: "grid grid-cols-1 md:grid-cols-2 gap-4" },
@@ -47,6 +48,7 @@
       %>
 
       <% @form_fields.each do |field| %>
+        <% next if field.field_key == "confirm_email" %>
         <% next if field.field_key.present? && rendered_keys[field.field_key] %>
 
         <% if field.group_header? %>
diff --git a/spec/services/extended_event_registration_form_builder_spec.rb b/spec/services/extended_event_registration_form_builder_spec.rb
new file mode 100644
index 000000000..9fd7f7e21
--- /dev/null
+++ b/spec/services/extended_event_registration_form_builder_spec.rb
@@ -0,0 +1,111 @@
+require "rails_helper"
+
+RSpec.describe ExtendedEventRegistrationFormBuilder do
+  let(:event) { create(:event) }
+
+  describe ".build!" do
+    subject(:form) { described_class.build!(event) }
+
+    it "creates a registration form linked to the event" do
+      expect(form.name).to eq("Extended Event Registration")
+      expect(event.registration_form).to eq(form)
+    end
+
+    it "assigns sequential positions starting at 1" do
+      field_count = form.form_fields.count
+      positions = form.form_fields.unscoped.where(form: form).order(:position).pluck(:position)
+      expect(positions).to eq((1..field_count).to_a)
+    end
+
+    it "inherits basic contact fields from BaseRegistrationFormBuilder" do
+      %w[first_name last_name primary_email confirm_email].each do |key|
+        field = form.form_fields.find_by(field_key: key)
+        expect(field).to be_present, "expected field_key '#{key}' to exist"
+        expect(field.field_group).to eq("contact")
+      end
+    end
+
+    it "adds extended contact fields beyond the basic set" do
+      extended_keys = %w[nickname pronouns primary_email_type secondary_email secondary_email_type
+                         mailing_street mailing_address_type mailing_city mailing_state mailing_zip
+                         phone phone_type agency_name agency_position]
+      extended_keys.each do |key|
+        field = form.form_fields.find_by(field_key: key)
+        expect(field).to be_present, "expected field_key '#{key}' to exist"
+      end
+    end
+
+    it "creates workshop_environments field with correct key" do
+      field = form.form_fields.find_by(field_key: "workshop_environments")
+      expect(field).to be_present
+      expect(field.answer_type).to eq("multiple_choice_checkbox")
+    end
+
+    it "inherits consent fields from BaseRegistrationFormBuilder" do
+      field = form.form_fields.find_by(field_key: "communication_consent")
+      expect(field).to be_present
+      expect(field.answer_type).to eq("multiple_choice_radio")
+      expect(field.is_required).to be true
+      expect(field.field_group).to eq("consent")
+    end
+
+    it "inherits scholarship fields from BaseRegistrationFormBuilder" do
+      field = form.form_fields.find_by(field_key: "scholarship_eligibility")
+      expect(field).to be_present
+      expect(field.field_group).to eq("scholarship")
+    end
+
+    it "creates payment fields" do
+      attendees = form.form_fields.find_by(field_key: "number_of_attendees")
+      expect(attendees.answer_datatype).to eq("number_integer")
+      expect(attendees.is_required).to be true
+
+      payment = form.form_fields.find_by(field_key: "payment_method")
+      expect(payment.answer_type).to eq("multiple_choice_radio")
+    end
+
+    it "creates all expected field groups" do
+      groups = form.form_fields.pluck(:field_group).uniq.sort
+      expect(groups).to contain_exactly("background", "consent", "contact", "payment", "professional", "qualitative", "scholarship")
+    end
+  end
+
+  describe ".build! without contact fields" do
+    subject(:form) { described_class.build!(event, include_contact_fields: false) }
+
+    it "omits contact fields" do
+      expect(form.form_fields.find_by(field_key: "first_name")).to be_nil
+      expect(form.form_fields.find_by(field_key: "primary_email")).to be_nil
+    end
+
+    it "still includes consent fields" do
+      expect(form.form_fields.find_by(field_key: "communication_consent")).to be_present
+    end
+
+    it "still includes scholarship fields" do
+      expect(form.form_fields.find_by(field_key: "scholarship_eligibility")).to be_present
+    end
+  end
+
+  describe ".build_standalone!" do
+    it "creates a form without linking to an event" do
+      form = described_class.build_standalone!
+
+      expect(form.name).to eq("Extended Event Registration")
+      expect(form.event_forms).to be_empty
+    end
+  end
+
+  describe ".copy!" do
+    it "duplicates a form for a new event" do
+      source_form = described_class.build!(event)
+      new_event = create(:event)
+
+      copied = described_class.copy!(from_form: source_form, to_event: new_event)
+
+      expect(copied.id).not_to eq(source_form.id)
+      expect(copied.form_fields.count).to eq(source_form.form_fields.count)
+      expect(new_event.registration_form).to eq(copied)
+    end
+  end
+end
diff --git a/spec/services/short_event_registration_form_builder_spec.rb b/spec/services/short_event_registration_form_builder_spec.rb
new file mode 100644
index 000000000..dda53dbee
--- /dev/null
+++ b/spec/services/short_event_registration_form_builder_spec.rb
@@ -0,0 +1,61 @@
+require "rails_helper"
+
+RSpec.describe ShortEventRegistrationFormBuilder do
+  let(:event) { create(:event) }
+
+  describe ".build!" do
+    subject(:form) { described_class.build!(event) }
+
+    it "creates a registration form linked to the event" do
+      expect(form.name).to eq("Short Event Registration")
+      expect(event.registration_form).to eq(form)
+    end
+
+    it "assigns sequential positions starting at 1" do
+      field_count = form.form_fields.count
+      positions = form.form_fields.unscoped.where(form: form).order(:position).pluck(:position)
+      expect(positions).to eq((1..field_count).to_a)
+    end
+
+    it "inherits basic contact fields from BaseRegistrationFormBuilder" do
+      %w[first_name last_name primary_email confirm_email].each do |key|
+        field = form.form_fields.find_by(field_key: key)
+        expect(field).to be_present, "expected field_key '#{key}' to exist"
+        expect(field.field_group).to eq("contact")
+      end
+    end
+
+    it "inherits consent fields from BaseRegistrationFormBuilder" do
+      field = form.form_fields.find_by(field_key: "communication_consent")
+      expect(field).to be_present
+      expect(field.answer_type).to eq("multiple_choice_radio")
+      expect(field.is_required).to be true
+      expect(field.field_group).to eq("consent")
+    end
+
+    it "inherits scholarship fields from BaseRegistrationFormBuilder" do
+      field = form.form_fields.find_by(field_key: "scholarship_eligibility")
+      expect(field).to be_present
+      expect(field.field_group).to eq("scholarship")
+    end
+
+    it "creates short-specific qualitative fields" do
+      referral = form.form_fields.find_by(field_key: "referral_source")
+      expect(referral.answer_type).to eq("multiple_choice_checkbox")
+      expect(referral.is_required).to be true
+
+      interest = form.form_fields.find_by(field_key: "training_interest")
+      expect(interest.answer_type).to eq("multiple_choice_checkbox")
+      expect(interest.is_required).to be true
+    end
+  end
+
+  describe ".build_standalone!" do
+    it "creates a form without linking to an event" do
+      form = described_class.build_standalone!
+
+      expect(form.name).to eq("Short Event Registration")
+      expect(form.event_forms).to be_empty
+    end
+  end
+end