diff --git a/app/controllers/users/webauthn_setup_controller.rb b/app/controllers/users/webauthn_setup_controller.rb
index b2d1346f14f..2b04aa2dd38 100644
--- a/app/controllers/users/webauthn_setup_controller.rb
+++ b/app/controllers/users/webauthn_setup_controller.rb
@@ -183,17 +183,12 @@ def process_invalid_webauthn(form)
         else
           flash.now[:error] = t('errors.webauthn_setup.unique_name')
         end
-
-        render :new
+      elsif form.platform_authenticator?
+        flash[:error] = t('errors.webauthn_platform_setup.general_error')
       else
-        if form.platform_authenticator?
-          flash[:error] = t('errors.webauthn_platform_setup.general_error')
-        else
-          flash[:error] = t('errors.webauthn_setup.general_error')
-        end
-
-        redirect_to account_two_factor_authentication_path
+        flash[:error] = t('errors.webauthn_setup.general_error')
       end
+      render :new
     end
 
     def mark_user_as_fully_authenticated
diff --git a/app/javascript/packs/webauthn-setup.ts b/app/javascript/packs/webauthn-setup.ts
index f0b68e2eda2..3915be22c44 100644
--- a/app/javascript/packs/webauthn-setup.ts
+++ b/app/javascript/packs/webauthn-setup.ts
@@ -19,8 +19,9 @@ function webauthn() {
   if (!isWebAuthnEnabled()) {
     reloadWithError('NotSupportedError');
   }
-  const continueButton = document.getElementById('continue-button')!;
-  continueButton.addEventListener('click', () => {
+  const form = document.getElementById('webauthn_form') as HTMLFormElement;
+  form.addEventListener('submit', (event) => {
+    event.preventDefault();
     document.getElementById('spinner')!.classList.remove('display-none');
     document.getElementById('continue-button')!.className = 'display-none';
 
@@ -47,19 +48,6 @@ function webauthn() {
       })
       .catch((err) => reloadWithError(err.name, { force: true }));
   });
-  const input = document.getElementById('nickname') as HTMLInputElement;
-  input.addEventListener('keypress', function (event) {
-    if (event.keyCode === 13) {
-      // prevent form submit
-      event.preventDefault();
-    }
-  });
-  input.addEventListener('keyup', function (event) {
-    event.preventDefault();
-    if (event.keyCode === 13 && input.value) {
-      continueButton.click();
-    }
-  });
 }
 
 if (process.env.NODE_ENV !== 'test') {
diff --git a/app/views/users/webauthn_setup/new.html.erb b/app/views/users/webauthn_setup/new.html.erb
index e5b741968b1..611731e5386 100644
--- a/app/views/users/webauthn_setup/new.html.erb
+++ b/app/views/users/webauthn_setup/new.html.erb
@@ -52,13 +52,12 @@
           checked: @presenter.remember_device_box_checked?,
         },
       ) %>
-  <%= submit_tag t('forms.buttons.submit.default'), id: 'submit-button', class: 'display-none' %>
+  <%= submit_tag(
+        @presenter.button_text,
+        id: 'continue-button',
+        class: 'display-block usa-button usa-button--big usa-button--wide margin-y-5',
+      ) %>
 <% end %>
-<%= button_tag(
-      @presenter.button_text,
-      class: 'display-block usa-button usa-button--big usa-button--wide margin-y-5',
-      id: 'continue-button',
-    ) %>
 
 <div class="spinner display-none margin-y-4" id='spinner'>
   <div class='text-center'>
diff --git a/spec/features/webauthn/management_spec.rb b/spec/features/webauthn/management_spec.rb
index e36e5877d9d..e8c25746930 100644
--- a/spec/features/webauthn/management_spec.rb
+++ b/spec/features/webauthn/management_spec.rb
@@ -21,7 +21,7 @@ def expect_webauthn_setup_success
 
   def expect_webauthn_setup_error
     expect(page).to have_content t('errors.webauthn_setup.general_error')
-    expect(current_path).to eq account_two_factor_authentication_path
+    expect(current_path).to eq webauthn_setup_path
   end
 
   def visit_webauthn_platform_setup
@@ -41,7 +41,7 @@ def expect_webauthn_platform_setup_success
 
   def expect_webauthn_platform_setup_error
     expect(page).to have_content t('errors.webauthn_platform_setup.general_error')
-    expect(current_path).to eq account_two_factor_authentication_path
+    expect(current_path).to eq webauthn_setup_path
   end
 
   context 'with webauthn roaming associations' do
diff --git a/spec/features/webauthn/sign_up_spec.rb b/spec/features/webauthn/sign_up_spec.rb
index 74f09e95ea0..1770458506d 100644
--- a/spec/features/webauthn/sign_up_spec.rb
+++ b/spec/features/webauthn/sign_up_spec.rb
@@ -18,7 +18,7 @@ def expect_webauthn_setup_success
 
   def expect_webauthn_setup_error
     expect(page).to have_content t('errors.webauthn_setup.general_error')
-    expect(page).to have_current_path(authentication_methods_setup_path)
+    expect(page).to have_current_path(webauthn_setup_path)
   end
 
   it_behaves_like 'webauthn setup'
diff --git a/spec/support/features/webauthn_helper.rb b/spec/support/features/webauthn_helper.rb
index efc78d7c6f0..9cc174c363e 100644
--- a/spec/support/features/webauthn_helper.rb
+++ b/spec/support/features/webauthn_helper.rb
@@ -24,7 +24,7 @@ def fill_in_nickname_and_click_continue(nickname: 'mykey')
   end
 
   def mock_submit_without_pressing_button_on_hardware_key_on_setup
-    first('#submit-button', visible: false).click
+    first('#continue-button').click
   end
 
   def mock_press_button_on_hardware_key_on_setup
@@ -37,9 +37,9 @@ def mock_press_button_on_hardware_key_on_setup
     set_hidden_field('attestation_object', attestation_object)
     set_hidden_field('client_data_json', setup_client_data_json)
 
-    button = first('#submit-button', visible: false)
+    button = first('#continue-button')
     if javascript_enabled?
-      button.execute_script('this.click()')
+      page.evaluate_script('document.querySelector("form").submit()')
     else
       button.click
     end