diff --git a/app/views/idv/by_mail/enter_code/_did_not_receive_letter.html.erb b/app/views/idv/by_mail/enter_code/_did_not_receive_letter.html.erb
new file mode 100644
index 00000000000..d6b970d9eca
--- /dev/null
+++ b/app/views/idv/by_mail/enter_code/_did_not_receive_letter.html.erb
@@ -0,0 +1,52 @@
+<% if !@can_request_another_letter %>
+  <%= render AlertComponent.new(type: :warning, class: 'margin-bottom-4') do %>
+    <%= t(
+          'idv.gpo.alert_rate_limit_warning_html',
+          date_letter_was_sent: I18n.l(
+            @last_date_letter_was_sent,
+            format: :event_date,
+          ),
+        ) %>
+  <% end %>
+<% end %>
+
+<%= render AlertComponent.new(type: :info, class: 'margin-bottom-4', text_tag: 'div') do %>
+  <p>
+    <%= t('idv.gpo.alert_info') %>
+    <br>
+    <%= render 'shared/address', address: @gpo_verify_form.pii %>
+  </p>
+  <p>
+    <%= t('idv.gpo.wrong_address') %>
+    <%= link_to t('idv.gpo.clear_and_start_over'), idv_confirm_start_over_path %>
+  </p>
+<% end %>
+
+<%= render PageHeadingComponent.new.with_content(t('idv.gpo.did_not_receive_letter.title')) %>
+
+<% if @can_request_another_letter %>
+  <%= t(
+        'idv.gpo.did_not_receive_letter.intro.request_new_letter_prompt_html',
+        request_new_letter_link: link_to(
+          t('idv.gpo.did_not_receive_letter.intro.request_new_letter_link'),
+          idv_request_letter_path,
+        ),
+      ) %>
+<% end %>
+<%= t('idv.gpo.did_not_receive_letter.intro.be_patient_html') %>
+
+<hr class="margin-y-4" />
+
+<h2><%= t('idv.gpo.form.title') %></h2>
+
+<p class="margin-bottom-1">
+  <%= t('idv.gpo.did_not_receive_letter.form.instructions') %>
+</p>
+
+<%= render 'form' %>
+
+<%= link_to t('idv.gpo.return_to_profile'), account_path %>
+
+<div class="margin-top-2 padding-top-2 border-top border-primary-light">
+  <%= link_to t('idv.messages.clear_and_start_over'), idv_confirm_start_over_path %>
+</div>
diff --git a/app/views/idv/by_mail/enter_code/_enter_code.html.erb b/app/views/idv/by_mail/enter_code/_enter_code.html.erb
new file mode 100644
index 00000000000..c30a8fcff09
--- /dev/null
+++ b/app/views/idv/by_mail/enter_code/_enter_code.html.erb
@@ -0,0 +1,47 @@
+<% if !@can_request_another_letter %>
+  <%= render AlertComponent.new(type: :warning, class: 'margin-bottom-4') do %>
+    <%= t(
+          'idv.gpo.alert_rate_limit_warning_html',
+          date_letter_was_sent: I18n.l(
+            @last_date_letter_was_sent,
+            format: :event_date,
+          ),
+        ) %>
+  <% end %>
+<% end %>
+
+<%= render AlertComponent.new(type: :info, class: 'margin-bottom-4', text_tag: 'div') do %>
+  <p>
+    <%= t('idv.gpo.alert_info') %>
+    <br>
+    <%= render 'shared/address', address: @gpo_verify_form.pii %>
+  </p>
+  <p>
+    <%= t('idv.gpo.wrong_address') %>
+    <%= link_to t('idv.gpo.clear_and_start_over'), idv_confirm_start_over_path %>
+  </p>
+<% end %>
+
+<%= render PageHeadingComponent.new.with_content(t('idv.gpo.title')) %>
+
+<%= t('idv.gpo.intro_html') %>
+
+<hr class="margin-y-4" />
+
+<h2><%= t('idv.gpo.form.title') %></h2>
+
+<p class="margin-bottom-1">
+  <%= t('idv.gpo.form.instructions') %>
+</p>
+
+<%= render 'form' %>
+
+<% if @can_request_another_letter %>
+  <%= link_to t('idv.messages.gpo.resend'), idv_request_letter_path, class: 'display-block margin-bottom-2' %>
+<% end %>
+
+<%= link_to t('idv.gpo.return_to_profile'), account_path %>
+
+<div class="margin-top-2 padding-top-2 border-top border-primary-light">
+  <%= link_to t('idv.messages.clear_and_start_over'), idv_confirm_start_over_path %>
+</div>
diff --git a/app/views/idv/by_mail/enter_code/_form.html.erb b/app/views/idv/by_mail/enter_code/_form.html.erb
new file mode 100644
index 00000000000..96f1ef3bcac
--- /dev/null
+++ b/app/views/idv/by_mail/enter_code/_form.html.erb
@@ -0,0 +1,22 @@
+<%= simple_form_for(
+      @gpo_verify_form,
+      url: idv_verify_by_mail_enter_code_path,
+      html: { autocomplete: 'off', method: :post },
+    ) do |f| %>
+  <div class="grid-row margin-top-neg-2 margin-bottom-5">
+    <div class="grid-col-12 tablet:grid-col-6">
+      <%= render ValidatedFieldComponent.new(
+            form: f,
+            name: :otp,
+            maxlength: 10,
+            required: true,
+            autofocus: true,
+            input_html: {
+              value: @code,
+            },
+            label: t('idv.gpo.form.otp_label'),
+          ) %>
+      <%= f.submit t('idv.gpo.form.submit'), full_width: true, wide: false, class: 'display-block margin-top-5' %>
+    </div>
+  </div>
+<% end %>
diff --git a/app/views/idv/by_mail/enter_code/index.html.erb b/app/views/idv/by_mail/enter_code/index.html.erb
index 1bc72fa6e6a..98d858879e4 100644
--- a/app/views/idv/by_mail/enter_code/index.html.erb
+++ b/app/views/idv/by_mail/enter_code/index.html.erb
@@ -9,98 +9,8 @@
 
 <% if @user_did_not_receive_letter %>
   <% self.title = t('idv.gpo.did_not_receive_letter.title') %>
+  <%= render 'did_not_receive_letter' %>
 <% else %>
   <% self.title = t('idv.gpo.title') %>
+  <%= render 'enter_code' %>
 <% end %>
-
-<% if !@can_request_another_letter %>
-  <%= render AlertComponent.new(type: :warning, class: 'margin-bottom-4') do %>
-    <%= t(
-          'idv.gpo.alert_rate_limit_warning_html',
-          date_letter_was_sent: I18n.l(
-            @last_date_letter_was_sent,
-            format: :event_date,
-          ),
-        ) %>
-  <% end %>
-<% end %>
-
-<%= render AlertComponent.new(type: :info, class: 'margin-bottom-4', text_tag: 'div') do %>
-  <p>
-    <%= t('idv.gpo.alert_info') %>
-    <br>
-    <%= render 'shared/address', address: @gpo_verify_form.pii %>
-  </p>
-  <p>
-    <%= t('idv.gpo.wrong_address') %>
-    <%= link_to t('idv.gpo.clear_and_start_over'), idv_confirm_start_over_path %>
-  </p>
-<% end %>
-
-<%= render PageHeadingComponent.new.with_content(
-      if @user_did_not_receive_letter
-        t('idv.gpo.did_not_receive_letter.title')
-      else
-        t('idv.gpo.title')
-      end,
-    ) %>
-
-<% if @user_did_not_receive_letter %>
-  <% if @can_request_another_letter %>
-    <%= t(
-          'idv.gpo.did_not_receive_letter.intro.request_new_letter_prompt_html',
-          request_new_letter_link: link_to(
-            t('idv.gpo.did_not_receive_letter.intro.request_new_letter_link'),
-            idv_request_letter_path,
-          ),
-        ) %>
-  <% end %>
-    <%= t('idv.gpo.did_not_receive_letter.intro.be_patient_html') %>
-<% else %>
-  <%= t('idv.gpo.intro_html') %>
-<% end %>
-<hr class="margin-y-4" />
-<h2><%= t('idv.gpo.form.title') %></h2>
-
-<p class="margin-bottom-1">
-  <%= if @user_did_not_receive_letter
-        t('idv.gpo.did_not_receive_letter.form.instructions')
-      else
-        t('idv.gpo.form.instructions')
-      end %>
-</p>
-
-<%= simple_form_for(
-      @gpo_verify_form,
-      url: idv_verify_by_mail_enter_code_path,
-      html: { autocomplete: 'off', method: :post },
-    ) do |f| %>
-  <div class="grid-row margin-top-neg-2 margin-bottom-5">
-    <div class="grid-col-12 tablet:grid-col-6">
-      <%= render ValidatedFieldComponent.new(
-            form: f,
-            name: :otp,
-            maxlength: 10,
-            required: true,
-            autofocus: true,
-            input_html: {
-              value: @code,
-            },
-            label: t('idv.gpo.form.otp_label'),
-          ) %>
-      <%= f.submit t('idv.gpo.form.submit'), full_width: true, wide: false, class: 'display-block margin-top-5' %>
-    </div>
-  </div>
-<% end %>
-
-<% if @can_request_another_letter %>
-  <% unless @user_did_not_receive_letter %>
-    <%= link_to t('idv.messages.gpo.resend'), idv_request_letter_path, class: 'display-block margin-bottom-2' %>
-  <% end %>
-<% end %>
-
-<%= link_to t('idv.gpo.return_to_profile'), account_path %>
-
-<div class="margin-top-2 padding-top-2 border-top border-primary-light">
-  <%= link_to t('idv.messages.clear_and_start_over'), idv_confirm_start_over_path %>
-</div>