diff --git a/app/components/validated_field_component.rb b/app/components/validated_field_component.rb
index 7a609057c29..097e215575e 100644
--- a/app/components/validated_field_component.rb
+++ b/app/components/validated_field_component.rb
@@ -1,5 +1,5 @@
 class ValidatedFieldComponent < BaseComponent
-  attr_reader :form, :name, :tag_options
+  attr_reader :form, :name, :tag_options, :input_type
 
   alias_method :f, :form
 
@@ -8,23 +8,36 @@ def initialize(form:, name:, error_messages: {}, **tag_options)
     @name = name
     @error_messages = error_messages
     @tag_options = tag_options
+    @input_type = inferred_input_type
   end
 
   def error_messages
     {
       valueMissing: value_missing_error_message,
+      typeMismatch: type_mismatch_error_message,
       **@error_messages,
-    }
+    }.compact
   end
 
   private
 
   def value_missing_error_message
-    case form.send(:default_input_type, name, form.send(:find_attribute_column, name), tag_options)
+    case input_type
     when :boolean
       t('forms.validation.required_checkbox')
     else
       t('simple_form.required.text')
     end
   end
+
+  def type_mismatch_error_message
+    case input_type
+    when :email
+      t('valid_email.validations.email.invalid')
+    end
+  end
+
+  def inferred_input_type
+    form.send(:default_input_type, name, form.send(:find_attribute_column, name), tag_options)
+  end
 end
diff --git a/app/forms/register_user_email_form.rb b/app/forms/register_user_email_form.rb
index 9b625e4dc98..cf315f9d29a 100644
--- a/app/forms/register_user_email_form.rb
+++ b/app/forms/register_user_email_form.rb
@@ -38,7 +38,7 @@ def validate_terms_accepted
   end
 
   def submit(params, instructions = nil)
-    @terms_accepted = params[:terms_accepted] == 'true'
+    @terms_accepted = params[:terms_accepted] == '1'
     build_user_and_email_address_with_email(
       email: params[:email],
       email_language: params[:email_language],
diff --git a/app/javascript/packages/validated-field/index.js b/app/javascript/packages/validated-field/index.js
index 4736c283bcc..4fc77447f8f 100644
--- a/app/javascript/packages/validated-field/index.js
+++ b/app/javascript/packages/validated-field/index.js
@@ -66,7 +66,9 @@ export class ValidatedField extends HTMLElement {
   setErrorMessage(message) {
     if (message) {
       this.getOrCreateErrorMessageElement().textContent = message;
-      this.input?.focus();
+      if (!document.activeElement?.classList.contains('usa-input--error')) {
+        this.input?.focus();
+      }
     } else if (this.errorMessage) {
       this.inputWrapper?.removeChild(this.errorMessage);
       this.errorMessage = null;
diff --git a/app/javascript/packages/validated-field/index.spec.js b/app/javascript/packages/validated-field/index.spec.js
index e93d04a8618..cf1c0cdbaf9 100644
--- a/app/javascript/packages/validated-field/index.spec.js
+++ b/app/javascript/packages/validated-field/index.spec.js
@@ -8,8 +8,11 @@ describe('ValidatedField', () => {
     customElements.define('lg-validated-field', ValidatedField);
   });
 
+  let idCounter = 0;
+
   function createAndConnectElement({ hasInitialError = false } = {}) {
     const element = document.createElement('lg-validated-field');
+    const errorMessageId = ++idCounter;
     element.innerHTML = `
       <script type="application/json" class="validated-field__error-strings">
         {
@@ -19,14 +22,14 @@ describe('ValidatedField', () => {
       <div class="validated-field__input-wrapper">
         <input
           aria-invalid="false"
-          aria-describedby="validated-field-error-298658fb"
+          aria-describedby="validated-field-error-${errorMessageId}"
           required="required"
           aria-required="true"
           class="validated-field__input${hasInitialError ? ' usa-input--error' : ''}"
         />
         ${
           hasInitialError
-            ? '<div class="usa-error-message" id="validated-field-error-298658fb">Invalid value</div>'
+            ? `<div class="usa-error-message" id="validated-field-error-${errorMessageId}">Invalid value</div>`
             : ''
         }
       </div>
@@ -89,6 +92,21 @@ describe('ValidatedField', () => {
     expect(() => getByText(element, 'This field is required')).to.throw();
   });
 
+  it('focuses the first element with an error', () => {
+    const firstElement = createAndConnectElement();
+    createAndConnectElement();
+
+    /** @type {HTMLInputElement} */
+    const firstInput = getByRole(firstElement, 'textbox');
+
+    /** @type {HTMLFormElement} */
+    const form = document.querySelector('form');
+
+    form.checkValidity();
+
+    expect(document.activeElement).to.equal(firstInput);
+  });
+
   context('with initial error message', () => {
     it('clears existing validation state on input', () => {
       const element = createAndConnectElement();
diff --git a/app/javascript/packs/email-validation.js b/app/javascript/packs/email-validation.js
deleted file mode 100644
index c0452a685b7..00000000000
--- a/app/javascript/packs/email-validation.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Allows HTML5 email validation with consistent errors across all browsers
-function emailValidation() {
-  const alert = document.querySelector('.email-invalid-alert');
-  const alertInline = document.querySelector('.email-invalid-alert-inline');
-  const email = document.querySelector('input[type="email"]');
-  let blurTimer;
-
-  // remove focus from the email input after error is displayed
-  function blurEmailInput(input) {
-    blurTimer = setTimeout(function () {
-      input.blur();
-    }, 0);
-  }
-
-  function resetEmailInvalid(input) {
-    input.classList.remove('usa-input--error');
-    alert.classList.add('display-none');
-    alertInline.classList.add('display-none');
-    clearTimeout(blurTimer);
-  }
-
-  function displayEmailInvalid(input) {
-    input.classList.add('usa-input--error');
-    alert.classList.remove('display-none');
-    alertInline.classList.remove('display-none');
-    blurEmailInput(input);
-  }
-
-  if (email) {
-    email.classList.remove('field');
-    email.classList.add('usa-input'); // use usds 2.0 styles
-    email.addEventListener('invalid', (e) => {
-      resetEmailInvalid(e.target);
-      if (!e.target.validity.valid) {
-        displayEmailInvalid(e.target);
-      }
-    });
-    email.addEventListener('input', (e) => {
-      resetEmailInvalid(e.target);
-    });
-  }
-}
-
-document.addEventListener('DOMContentLoaded', emailValidation);
diff --git a/app/services/request_password_reset.rb b/app/services/request_password_reset.rb
index 06f902baa73..ed6bd416bad 100644
--- a/app/services/request_password_reset.rb
+++ b/app/services/request_password_reset.rb
@@ -5,7 +5,7 @@
   def perform
     if user_should_receive_registration_email?
       form = RegisterUserEmailForm.new(password_reset_requested: true, analytics: analytics)
-      result = form.submit({ email: email, terms_accepted: 'true' }, instructions)
+      result = form.submit({ email: email, terms_accepted: '1' }, instructions)
       [form.user, result]
     else
       send_reset_password_instructions
diff --git a/app/views/sign_up/registrations/new.html.erb b/app/views/sign_up/registrations/new.html.erb
index 184b2ab2c11..b1a1bf75a6e 100644
--- a/app/views/sign_up/registrations/new.html.erb
+++ b/app/views/sign_up/registrations/new.html.erb
@@ -2,65 +2,60 @@
 
 <%= render 'shared/sp_alert' %>
 
-<%= render AlertComponent.new(
-      type: :error,
-      class: 'email-invalid-alert margin-bottom-4 display-none',
-      message: t('sign_up.email.invalid_email_alert_head'),
-    ) %>
-
 <h1 class='margin-y-0'><%= t('titles.registrations.new') %></h1>
 
-<div class='margin-bottom-6'>
-  <%= validated_form_for(
-        @register_user_email_form,
-        html: { autocomplete: 'off' },
-        url: sign_up_register_path,
-      ) do |f| %>
-    <%= f.input :email,
-                label: t('forms.registration.labels.email'),
-                required: true,
-                input_html: { autocorrect: 'off', aria: { invalid: false } } %>
-
-    <span class='email-invalid-alert-inline usa-error-message margin-top-neg-3 margin-bottom-3 display-none' role='alert'>
-      <%= t('sign_up.email.invalid_email_alert_inline') %>
-    </span>
+<%= simple_form_for(
+      @register_user_email_form,
+      html: { autocomplete: 'off' },
+      url: sign_up_register_path,
+    ) do |f| %>
+  <%= render ValidatedFieldComponent.new(
+        form: f,
+        name: :email,
+        as: :email,
+        label: t('forms.registration.labels.email'),
+        required: true,
+        input_html: { autocorrect: 'off' },
+      ) %>
 
-    <fieldset class="usa-fieldset">
-      <legend class="margin-bottom-1">
-        <%= t('forms.registration.labels.email_language') %>
-      </legend>
+  <fieldset class="usa-fieldset">
+    <legend class="margin-bottom-1">
+      <%= t('forms.registration.labels.email_language') %>
+    </legend>
 
-      <p class="margin-bottom-4">
-        <%= t(
-              'account.email_language.languages_list',
-              app_name: APP_NAME,
-              list: I18n.available_locales.
-                map { |locale| t("account.email_language.name.#{locale}") }.
-                to_sentence(last_word_connector: " #{t('account.email_language.sentence_connector')} "),
-            ) %>
-      </p>
+    <p class="margin-bottom-4">
+      <%= t(
+            'account.email_language.languages_list',
+            app_name: APP_NAME,
+            list: I18n.available_locales.
+              map { |locale| t("account.email_language.name.#{locale}") }.
+              to_sentence(last_word_connector: " #{t('account.email_language.sentence_connector')} "),
+          ) %>
+    </p>
 
-      <%= render partial: 'shared/email_languages',
-                 locals: { f: f, selection: @register_user_email_form.email_language } %>
-    </fieldset>
+    <%= render partial: 'shared/email_languages',
+               locals: { f: f, selection: @register_user_email_form.email_language } %>
+  </fieldset>
 
-    <div class="margin-bottom-3">
-      <%= f.check_box :terms_accepted, { class: 'usa-checkbox__input',
-                                         required: true, aria: { invalid: false } }, true, false %>
-      <label for="user_terms_accepted" class="usa-checkbox__label">
-        <%= t('sign_up.terms', app_name: APP_NAME) %>
-        <%= new_window_link_to(t('titles.rules_of_use'), MarketingSite.rules_of_use_url) %>
-      </label>
-      <div class="usa-error-message display-if-invalid display-if-invalid--value-missing" role="alert">
-        <%= t('forms.validation.required_checkbox') %>
-      </div>
-    </div>
+  <%= render ValidatedFieldComponent.new(
+        form: f,
+        name: :terms_accepted,
+        as: :boolean,
+        label: capture do %>
+          <%= t('sign_up.terms', app_name: APP_NAME) %>
+          <%= new_window_link_to(t('titles.rules_of_use'), MarketingSite.rules_of_use_url) %>
+        <% end,
+        required: true,
+      ) %>
 
-    <%= f.input :request_id, as: :hidden, input_html: { value: params[:request_id] || request_id } %>
-    <%= f.button :button, t('forms.buttons.submit.default'), type: :submit,
-                                                             class: 'usa-button--big grid-col-8 mobile-lg:grid-col-6' %>
+  <%= f.input :request_id, as: :hidden, input_html: { value: params[:request_id] || request_id } %>
+  <%= f.button(
+        :button,
+        t('forms.buttons.submit.default'),
+        type: :submit,
+        class: 'usa-button usa-button--big usa-button--wide margin-y-5',
+      ) %>
 <% end %>
-</div>
 
 <%= render 'shared/cancel', link: decorated_session.cancel_link_url %>
 
@@ -77,6 +72,3 @@
         MarketingSite.privacy_act_statement_url,
       ) %>
 </p>
-
-
-<%= javascript_packs_tag_once 'email-validation', 'accept-terms-button' %>
diff --git a/config/locales/sign_up/en.yml b/config/locales/sign_up/en.yml
index c7596505eca..2b848b487aa 100644
--- a/config/locales/sign_up/en.yml
+++ b/config/locales/sign_up/en.yml
@@ -5,8 +5,4 @@ en:
     cancel:
       success: Your account has been deleted. We did not save your information.
       warning_header: 'If you cancel now:'
-    email:
-      invalid_email_alert_head: 'Error: This is not a real email address. Make sure it
-        includes an @ and a domain name.'
-      invalid_email_alert_inline: Enter a real email address
     terms: Check this box to accept the %{app_name}
diff --git a/config/locales/sign_up/es.yml b/config/locales/sign_up/es.yml
index 1b4902a7f45..a3b30e7eb06 100644
--- a/config/locales/sign_up/es.yml
+++ b/config/locales/sign_up/es.yml
@@ -5,8 +5,4 @@ es:
     cancel:
       success: Su cuenta ha sido eliminada. No guardamos su información.
       warning_header: 'Si cancela ahora:'
-    email:
-      invalid_email_alert_head: 'Error: No es una dirección de correo electrónico
-        real. Asegúrese de que incluye una @ y un nombre de dominio.'
-      invalid_email_alert_inline: Ingrese una dirección de correo electrónico real
     terms: Marque esta casilla para aceptar las reglas de uso de %{app_name}
diff --git a/config/locales/sign_up/fr.yml b/config/locales/sign_up/fr.yml
index 006d08aaa0a..f1b12e35b74 100644
--- a/config/locales/sign_up/fr.yml
+++ b/config/locales/sign_up/fr.yml
@@ -5,8 +5,4 @@ fr:
     cancel:
       success: Le dossier contenant votre information a été effacé
       warning_header: 'Si vous annulez maintenant:'
-    email:
-      invalid_email_alert_head: 'Erreur: Ce n’est pas une vraie adresse email.
-        Assurez-vous qu’il comprend un @ et un nom de domaine.'
-      invalid_email_alert_inline: Entrez une adresse email réelle
     terms: Cochez cette case pour accepter les règles d’utilisation de %{app_name}
diff --git a/config/locales/valid_email/en.yml b/config/locales/valid_email/en.yml
index 7a4549e065b..977326bfdb3 100644
--- a/config/locales/valid_email/en.yml
+++ b/config/locales/valid_email/en.yml
@@ -3,5 +3,4 @@ en:
   valid_email:
     validations:
       email:
-        invalid: Invalid email address format or domain entered. Please enter a valid
-          email address.
+        invalid: Email address is not valid
diff --git a/config/locales/valid_email/es.yml b/config/locales/valid_email/es.yml
index d8b9ed85b45..83771a77dc3 100644
--- a/config/locales/valid_email/es.yml
+++ b/config/locales/valid_email/es.yml
@@ -3,5 +3,4 @@ es:
   valid_email:
     validations:
       email:
-        invalid: El formato de email o dominio ingresado no es válido. Corrija su email
-          y vuelva a intentarlo.
+        invalid: La dirección de correo electrónico no es válida
diff --git a/config/locales/valid_email/fr.yml b/config/locales/valid_email/fr.yml
index ba3ba23354b..3e7f3b995b1 100644
--- a/config/locales/valid_email/fr.yml
+++ b/config/locales/valid_email/fr.yml
@@ -3,5 +3,4 @@ fr:
   valid_email:
     validations:
       email:
-        invalid: Format d’adresse courriel ou domaine entré non valide. Corrigez
-          l’adresse et entrez-la de nouveau.
+        invalid: L’adresse électronique n’est pas valide
diff --git a/spec/components/validated_field_component_spec.rb b/spec/components/validated_field_component_spec.rb
index d6c5feb959f..d94290780b6 100644
--- a/spec/components/validated_field_component_spec.rb
+++ b/spec/components/validated_field_component_spec.rb
@@ -25,35 +25,38 @@
     render_inline(described_class.new(**options))
   end
 
-  it 'renders with error message texts' do
-    expect(rendered).to have_css(
-      'script',
-      text: { valueMissing: t('simple_form.required.text') }.to_json,
-      visible: :all,
-    )
-  end
-
-  context 'boolean type' do
-    let(:tag_options) { { as: :boolean } }
+  describe 'error message strings' do
+    subject(:strings) do
+      script = rendered.at_css('script[type="application/json"]')
+      JSON.parse(script.content, symbolize_names: true)
+    end
 
     it 'renders with error message texts' do
-      expect(rendered).to have_css(
-        'script',
-        text: { valueMissing: t('forms.validation.required_checkbox') }.to_json,
-        visible: :all,
-      )
+      expect(strings[:valueMissing]).to eq t('simple_form.required.text')
     end
-  end
 
-  context 'custom error message texts' do
-    let(:error_messages) { { valueMissing: 'missing', tooLong: 'too long' } }
+    context 'boolean type' do
+      let(:tag_options) { { as: :boolean } }
 
-    it 'renders with error message texts' do
-      expect(rendered).to have_css(
-        'script',
-        text: { valueMissing: 'missing', tooLong: 'too long' }.to_json,
-        visible: :all,
-      )
+      it 'renders with error message texts' do
+        expect(strings[:valueMissing]).to eq t('forms.validation.required_checkbox')
+      end
+    end
+
+    context 'email type' do
+      let(:tag_options) { { as: :email } }
+
+      it 'renders with error message texts' do
+        expect(strings[:typeMismatch]).to eq t('valid_email.validations.email.invalid')
+      end
+    end
+
+    context 'custom error message texts' do
+      let(:error_messages) { { valueMissing: 'missing', tooLong: 'too long' } }
+
+      it 'renders with error message texts' do
+        expect(strings).to include(valueMissing: 'missing', tooLong: 'too long')
+      end
     end
   end
 end
diff --git a/spec/controllers/sign_up/registrations_controller_spec.rb b/spec/controllers/sign_up/registrations_controller_spec.rb
index e5f584da459..666befabc30 100644
--- a/spec/controllers/sign_up/registrations_controller_spec.rb
+++ b/spec/controllers/sign_up/registrations_controller_spec.rb
@@ -37,7 +37,7 @@
         allow(@analytics).to receive(:track_event)
         allow(subject).to receive(:create_user_event)
 
-        post :create, params: { user: { email: 'new@example.com', terms_accepted: 'true' } }
+        post :create, params: { user: { email: 'new@example.com', terms_accepted: '1' } }
 
         user = User.find_with_email('new@example.com')
 
@@ -58,7 +58,7 @@
 
       it 'sets the users preferred email locale and sends an email in that locale' do
         post :create, params: { user: { email: 'test@test.com', email_language: 'es',
-                                        terms_accepted: 'true' } }
+                                        terms_accepted: '1' } }
 
         expect(User.find_with_email('test@test.com').email_language).to eq('es')
 
@@ -68,7 +68,7 @@
       end
 
       it 'sets the email in the session and redirects to sign_up_verify_email_path' do
-        post :create, params: { user: { email: 'test@test.com', terms_accepted: 'true' } }
+        post :create, params: { user: { email: 'test@test.com', terms_accepted: '1' } }
 
         expect(session[:email]).to eq('test@test.com')
         expect(response).to redirect_to(sign_up_verify_email_path)
@@ -78,7 +78,7 @@
         user = create(:user)
         stub_sign_in(user)
 
-        post :create, params: { user: { email: user.email, terms_accepted: 'true' } }
+        post :create, params: { user: { email: user.email, terms_accepted: '1' } }
 
         expect(response).to redirect_to account_path
       end
@@ -102,7 +102,7 @@
         with(Analytics::USER_REGISTRATION_EMAIL, analytics_hash)
       expect(subject).to_not receive(:create_user_event)
 
-      post :create, params: { user: { email: 'TEST@example.com ', terms_accepted: 'true' } }
+      post :create, params: { user: { email: 'TEST@example.com ', terms_accepted: '1' } }
     end
 
     it 'tracks unsuccessful user registration' do
@@ -121,11 +121,11 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::USER_REGISTRATION_EMAIL, analytics_hash)
 
-      post :create, params: { user: { email: 'invalid@', request_id: '', terms_accepted: 'true' } }
+      post :create, params: { user: { email: 'invalid@', request_id: '', terms_accepted: '1' } }
     end
 
     it 'renders new if email is nil' do
-      post :create, params: { user: { request_id: '123789', terms_accepted: 'true' } }
+      post :create, params: { user: { request_id: '123789', terms_accepted: '1' } }
 
       expect(response).to render_template(:new)
     end
diff --git a/spec/features/visitors/sign_up_with_email_spec.rb b/spec/features/visitors/sign_up_with_email_spec.rb
index d2cee437dbb..23d377e0fd6 100644
--- a/spec/features/visitors/sign_up_with_email_spec.rb
+++ b/spec/features/visitors/sign_up_with_email_spec.rb
@@ -14,7 +14,8 @@
 
   scenario 'visitor cannot sign up with invalid email address', js: true do
     sign_up_with('bogus')
-    expect_email_invalid(page)
+
+    expect(page).to have_content t('valid_email.validations.email.invalid')
   end
 
   scenario 'visitor cannot sign up with email with invalid domain name' do
@@ -33,7 +34,7 @@
   scenario 'visitor cannot sign up with empty email address', js: true do
     sign_up_with('')
 
-    expect_email_invalid(page)
+    expect(page).to have_content t('simple_form.required.text')
   end
 
   context 'user signs up and sets password, tries to sign up again' do
diff --git a/spec/forms/register_user_email_form_spec.rb b/spec/forms/register_user_email_form_spec.rb
index 6f23941c39f..6966a023af8 100644
--- a/spec/forms/register_user_email_form_spec.rb
+++ b/spec/forms/register_user_email_form_spec.rb
@@ -23,7 +23,7 @@
           domain_name: 'gmail.com',
         }
 
-        expect(subject.submit(email: 'TAKEN@gmail.com', terms_accepted: 'true').to_h).to eq(
+        expect(subject.submit(email: 'TAKEN@gmail.com', terms_accepted: '1').to_h).to eq(
           success: true,
           errors: {},
           **extra,
@@ -36,7 +36,7 @@
         existing_user = create(:user, :signed_up, email: 'taken@example.com')
 
         (IdentityConfig.store.reg_confirmed_email_max_attempts + 1).times do
-          subject.submit(email: 'TAKEN@example.com', terms_accepted: 'true')
+          subject.submit(email: 'TAKEN@example.com', terms_accepted: '1')
         end
 
         expect(analytics).to have_logged_event(
@@ -64,7 +64,7 @@
           domain_name: 'test.com',
         }
 
-        expect(subject.submit(email: user.email, terms_accepted: 'true').to_h).to eq(
+        expect(subject.submit(email: user.email, terms_accepted: '1').to_h).to eq(
           success: true,
           errors: {},
           **extra,
@@ -74,7 +74,7 @@
       it 'creates throttle events after reaching throttle limit' do
         user = create(:user, email: 'test@example.com', confirmed_at: nil, uuid: '123')
         (IdentityConfig.store.reg_unconfirmed_email_max_attempts + 1).times do
-          subject.submit(email: 'test@example.com', terms_accepted: 'true')
+          subject.submit(email: 'test@example.com', terms_accepted: '1')
         end
 
         expect(analytics).to have_logged_event(
@@ -94,7 +94,7 @@
         expect(SendSignUpEmailConfirmation).to receive(:new).
           and_return(send_sign_up_email_confirmation)
 
-        result = subject.submit(email: email_address.email, terms_accepted: 'true')
+        result = subject.submit(email: email_address.email, terms_accepted: '1')
         uuid = result.extra[:user_id]
         new_user = User.find_by(uuid: uuid)
 
@@ -106,7 +106,7 @@
 
     context 'when email is not already taken' do
       it 'is valid' do
-        submit_form = subject.submit(email: 'not_taken@gmail.com', terms_accepted: 'true')
+        submit_form = subject.submit(email: 'not_taken@gmail.com', terms_accepted: '1')
         extra = {
           email_already_exists: false,
           throttled: false,
@@ -125,7 +125,7 @@
         form = RegisterUserEmailForm.new(analytics: analytics)
 
         response = form.submit(
-          email: 'not_taken@gmail.com', email_language: 'fr', terms_accepted: 'true',
+          email: 'not_taken@gmail.com', email_language: 'fr', terms_accepted: '1',
         )
         expect(response).to be_success
 
@@ -144,7 +144,7 @@
           domain_name: 'invalid_email',
         }
 
-        expect(subject.submit(email: 'invalid_email', terms_accepted: 'true').to_h).to include(
+        expect(subject.submit(email: 'invalid_email', terms_accepted: '1').to_h).to include(
           success: false,
           errors: errors,
           error_details: hash_including(*errors.keys),
@@ -158,7 +158,7 @@
         submit_form = subject.submit(
           email: 'not_taken@example.com',
           request_id: 'fake_id',
-          terms_accepted: 'true',
+          terms_accepted: '1',
         )
 
         expect(submit_form.success?).to eq true
@@ -181,7 +181,7 @@
         submit_form = subject.submit(
           email: 'not_taken@example.com',
           request_id: request_id,
-          terms_accepted: 'true',
+          terms_accepted: '1',
         )
         extra = {
           domain_name: 'example.com',
@@ -207,7 +207,7 @@
         submit_form = subject.submit(
           email: 'not_taken@gmail.com',
           request_id: nil,
-          terms_accepted: 'true',
+          terms_accepted: '1',
         )
         extra = {
           domain_name: 'gmail.com',
diff --git a/spec/support/features/session_helper.rb b/spec/support/features/session_helper.rb
index 44bf5c3fa5f..3d2ccdb7c98 100644
--- a/spec/support/features/session_helper.rb
+++ b/spec/support/features/session_helper.rb
@@ -11,11 +11,6 @@ def sign_up_with(email)
       click_button t('forms.buttons.submit.default')
     end
 
-    def expect_email_invalid(page)
-      expect(page).to have_content t('sign_up.email.invalid_email_alert_head')
-      expect(page).to have_content t('sign_up.email.invalid_email_alert_inline')
-    end
-
     def choose_another_security_option(option)
       accept_rules_of_use_and_continue_if_displayed
 
diff --git a/tsconfig.json b/tsconfig.json
index 06385c49795..c1bd9dd1543 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,7 +23,6 @@
     "**/*.spec.js",
     "app/javascript/packs/accept-terms-button.js",
     "app/javascript/packs/application.js",
-    "app/javascript/packs/email-validation.js",
     "app/javascript/packs/personal-key-page-controller.js",
     "app/javascript/packs/pw-strength.js",
     "app/javascript/packs/reactivate-account-modal.js",