diff --git a/app/views/start_form/email_verification.html.erb b/app/views/start_form/email_verification.html.erb
index c312a0be..a0e3cce9 100644
--- a/app/views/start_form/email_verification.html.erb
+++ b/app/views/start_form/email_verification.html.erb
@@ -26,9 +26,9 @@
     <%= form_for '', url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug), method: :put, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
       <div dir="auto" class="form-control !mt-0">
         <%= f.hidden_field 'resubmit', value: params[:resubmit] %>
-        <%= f.hidden_field 'submitter[name]', value: params[:name] || @submitter&.name %>
-        <%= f.hidden_field 'submitter[email]', value: params[:email] || @submitter&.email %>
-        <%= f.hidden_field 'submitter[phone]', value: params[:phone] || @submitter&.phone %>
+        <%= f.hidden_field 'submitter[name]', value: params[:name] || params.dig(:submitter, :name) %>
+        <%= f.hidden_field 'submitter[email]', value: params[:email] || params.dig(:submitter, :email) %>
+        <%= f.hidden_field 'submitter[phone]', value: params[:phone] || params.dig(:submitter, :phone) %>
         <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
         <div class="flex justify-between items-center mt-1">
           <span>
@@ -49,6 +49,6 @@
         <%= f.button button_title(title: t('submit')), class: 'base-button' %>
       </toggle-submit>
     <% end %>
-    <%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || @submitter&.name, email: params[:email] || @submitter&.email, phone: params[:phone] || @submitter&.phone } }.compact, method: :post, id: 'resend_code', class: 'hidden' %>
+    <%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || params.dig(:submitter, :name), email: params[:email] || params.dig(:submitter, :email), phone: params[:phone] || params.dig(:submitter, :phone) } }.compact, method: :post, id: 'resend_code', class: 'hidden' %>
   </div>
 </main>