diff --git a/app/controllers/sign_up/registrations_controller.rb b/app/controllers/sign_up/registrations_controller.rb
index ceaf77e4b93..2e082c1a820 100644
--- a/app/controllers/sign_up/registrations_controller.rb
+++ b/app/controllers/sign_up/registrations_controller.rb
@@ -41,9 +41,7 @@ def permitted_params
 
     def process_successful_creation
       user = @register_user_email_form.user
-      unless @register_user_email_form.email_taken?
-        create_user_event(:account_created, user)
-      end
+      create_user_event(:account_created, user) unless @register_user_email_form.email_taken?
 
       resend_confirmation = params[:user][:resend]
       session[:email] = @register_user_email_form.email
diff --git a/app/controllers/users/phone_setup_controller.rb b/app/controllers/users/phone_setup_controller.rb
index 6e26e60fb95..789ec49b7a2 100644
--- a/app/controllers/users/phone_setup_controller.rb
+++ b/app/controllers/users/phone_setup_controller.rb
@@ -9,17 +9,17 @@ class PhoneSetupController < ApplicationController
     before_action :set_setup_presenter
 
     def index
-      @user_phone_form = UserPhoneForm.new(current_user, nil)
+      @new_phone_form = NewPhoneForm.new(current_user)
       analytics.track_event(Analytics::USER_REGISTRATION_PHONE_SETUP_VISIT)
     end
 
     def create
-      @user_phone_form = UserPhoneForm.new(current_user, nil)
-      result = @user_phone_form.submit(user_phone_form_params)
+      @new_phone_form = NewPhoneForm.new(current_user)
+      result = @new_phone_form.submit(new_phone_form_params)
       analytics.track_event(Analytics::MULTI_FACTOR_AUTH_PHONE_SETUP, result.to_h)
 
       if result.success?
-        handle_create_success(@user_phone_form.phone)
+        handle_create_success(@new_phone_form.phone)
       else
         render :index
       end
@@ -34,8 +34,8 @@ def set_setup_presenter
     def handle_create_success(phone)
       if MfaContext.new(current_user).phone_configurations.map(&:phone).index(phone).nil?
         prompt_to_confirm_phone(id: nil,
-                                phone: @user_phone_form.phone,
-                                selected_delivery_method: @user_phone_form.otp_delivery_preference)
+                                phone: @new_phone_form.phone,
+                                selected_delivery_method: @new_phone_form.otp_delivery_preference)
       else
         flash[:error] = t('errors.messages.phone_duplicate')
         redirect_to phone_setup_url
@@ -46,10 +46,11 @@ def delivery_preference
       current_user.otp_delivery_preference
     end
 
-    def user_phone_form_params
-      params.require(:user_phone_form).permit(:phone, :international_code,
-                                              :otp_delivery_preference,
-                                              :otp_make_default_number)
+    def new_phone_form_params
+      params.require(:new_phone_form).permit(:phone,
+                                             :international_code,
+                                             :otp_delivery_preference,
+                                             :otp_make_default_number)
     end
   end
 end
diff --git a/app/controllers/users/phones_controller.rb b/app/controllers/users/phones_controller.rb
index b70b138274b..e3957c83bc4 100644
--- a/app/controllers/users/phones_controller.rb
+++ b/app/controllers/users/phones_controller.rb
@@ -6,12 +6,12 @@ class PhonesController < ReauthnRequiredController
 
     def add
       user_session[:phone_id] = nil
-      @user_phone_form = UserPhoneForm.new(current_user, nil)
+      @new_phone_form = NewPhoneForm.new(current_user)
     end
 
     def create
-      @user_phone_form = UserPhoneForm.new(current_user, nil)
-      if @user_phone_form.submit(user_params).success?
+      @new_phone_form = NewPhoneForm.new(current_user)
+      if @new_phone_form.submit(user_params).success?
         confirm_phone
         bypass_sign_in current_user
       else
@@ -22,15 +22,16 @@ def create
     def edit
       set_phone_id
       # memoized for view
-      user_phone_form
+      @edit_phone_form = EditPhoneForm.new(current_user, phone_configuration)
     end
 
     def update
-      if user_phone_form.submit(user_params).success? && !already_has_phone?
+      @edit_phone_form = EditPhoneForm.new(current_user, phone_configuration)
+      if @edit_phone_form.submit(edit_params).success?
         process_updates
         bypass_sign_in current_user
       else
-        render_edit
+        render :edit
       end
     end
 
@@ -50,10 +51,6 @@ def delete
 
     private
 
-    def user_phone_form
-      @user_phone_form ||= UserPhoneForm.new(current_user, phone_configuration)
-    end
-
     def render_edit
       flash.now[:error] = t('errors.messages.phone_duplicate') if already_has_phone?
       render :edit
@@ -67,13 +64,18 @@ def phone_configuration
     end
 
     def user_params
-      params.require(:user_phone_form).permit(:phone, :international_code,
-                                              :otp_delivery_preference,
+      params.require(:new_phone_form).permit(:phone, :international_code,
+                                             :otp_delivery_preference,
+                                             :otp_make_default_number)
+    end
+
+    def edit_params
+      params.require(:edit_phone_form).permit(:otp_delivery_preference,
                                               :otp_make_default_number)
     end
 
     def already_has_phone?
-      @user_has_phone ||= @user_phone_form.already_has_phone?
+      @user_has_phone ||= @new_phone_form.already_has_phone?
     end
 
     def delivery_preference
@@ -81,25 +83,24 @@ def delivery_preference
     end
 
     def process_updates
-      form = @user_phone_form
-      if form.phone_config_changed?
+      if @edit_phone_form.phone_config_changed?
         analytics.track_event(Analytics::PHONE_CHANGE_REQUESTED)
 
         OtpPreferenceUpdater.new(
           user: current_user,
-          preference: form.otp_delivery_preference,
-          default: form.otp_make_default_number,
+          preference: @edit_phone_form.otp_delivery_preference,
+          default: @edit_phone_form.otp_make_default_number,
           phone_id: user_session[:phone_id],
-          ).call
+        ).call
       end
       redirect_to account_url
     end
 
     def confirm_phone
       flash[:notice] = t('devise.registrations.phone_update_needs_confirmation')
-      prompt_to_confirm_phone(id: user_session[:phone_id], phone: @user_phone_form.phone,
-                              selected_delivery_method: @user_phone_form.otp_delivery_preference,
-                              selected_default_number: @user_phone_form.otp_make_default_number)
+      prompt_to_confirm_phone(id: user_session[:phone_id], phone: @new_phone_form.phone,
+                              selected_delivery_method: @new_phone_form.otp_delivery_preference,
+                              selected_default_number: @new_phone_form.otp_make_default_number)
     end
 
     def handle_successful_delete
diff --git a/app/controllers/users/totp_setup_controller.rb b/app/controllers/users/totp_setup_controller.rb
index 486433925c1..e95f4ee45ba 100644
--- a/app/controllers/users/totp_setup_controller.rb
+++ b/app/controllers/users/totp_setup_controller.rb
@@ -87,7 +87,7 @@ def process_successful_disable
     def revoke_otp_secret_key
       UpdateUser.new(
         user: current_user,
-        attributes: { otp_secret_key: nil},
+        attributes: { otp_secret_key: nil },
       ).call
     end
 
diff --git a/app/controllers/users/two_factor_authentication_setup_controller.rb b/app/controllers/users/two_factor_authentication_setup_controller.rb
index f21954bb5e6..7f493a0a6a7 100644
--- a/app/controllers/users/two_factor_authentication_setup_controller.rb
+++ b/app/controllers/users/two_factor_authentication_setup_controller.rb
@@ -35,7 +35,7 @@ def success
 
     def backup_code_only_processing
       if user_session[:signing_up] &&
-        @two_factor_options_form.selection == 'backup_code_only'
+         @two_factor_options_form.selection == 'backup_code_only'
         user_session[:signing_up] = false
       end
     end
diff --git a/app/forms/edit_phone_form.rb b/app/forms/edit_phone_form.rb
new file mode 100644
index 00000000000..b359c86e12f
--- /dev/null
+++ b/app/forms/edit_phone_form.rb
@@ -0,0 +1,66 @@
+class EditPhoneForm
+  include ActiveModel::Model
+  include RememberDeviceConcern
+
+  validates :otp_delivery_preference, inclusion: { in: %w[voice sms] }
+
+  attr_accessor :phone, :otp_delivery_preference, :otp_make_default_number, :phone_configuration
+
+  def initialize(user, phone_configuration)
+    self.user = user
+    self.phone_configuration = phone_configuration
+    self.otp_make_default_number = true if default_phone_configuration?
+  end
+
+  def submit(params)
+    ingest_submitted_params(params)
+    success = valid?
+
+    self.phone = submitted_phone unless success
+    revoke_remember_device(user) if success
+    FormResponse.new(success: success, errors: errors.messages, extra: extra_analytics_attributes)
+  end
+
+  def delivery_preference_sms?
+    phone_configuration&.delivery_preference == 'sms'
+  end
+
+  def delivery_preference_voice?
+    phone_configuration&.delivery_preference == 'voice'
+  end
+
+  def phone_config_changed?
+    return true if phone_configuration&.delivery_preference != otp_delivery_preference
+    return true if otp_make_default_number && !default_phone_configuration?
+    false
+  end
+
+  # :reek:FeatureEnvy
+  def masked_number
+    phone_number = phone_configuration.phone
+    return '' if !phone_number || phone_number.blank?
+    "***-***-#{phone_number[-4..-1]}"
+  end
+
+  private
+
+  attr_accessor :user, :submitted_phone
+
+  def extra_analytics_attributes
+    {
+      otp_delivery_preference: otp_delivery_preference,
+    }
+  end
+
+  def ingest_submitted_params(params)
+    delivery_prefs = params[:otp_delivery_preference]
+    default_prefs = params[:otp_make_default_number]
+
+    self.otp_delivery_preference = delivery_prefs if delivery_prefs
+    self.otp_make_default_number = true if default_prefs
+  end
+
+  def default_phone_configuration?
+    phone_configuration == user.default_phone_configuration
+  end
+end
diff --git a/app/forms/user_phone_form.rb b/app/forms/new_phone_form.rb
similarity index 61%
rename from app/forms/user_phone_form.rb
rename to app/forms/new_phone_form.rb
index 01dd16477ca..9cbb38eb043 100644
--- a/app/forms/user_phone_form.rb
+++ b/app/forms/new_phone_form.rb
@@ -1,4 +1,4 @@
-class UserPhoneForm
+class NewPhoneForm
   include ActiveModel::Model
   include FormPhoneValidator
   include OtpDeliveryPreferenceValidator
@@ -7,17 +7,12 @@ class UserPhoneForm
   validates :otp_delivery_preference, inclusion: { in: %w[voice sms] }
 
   attr_accessor :phone, :international_code, :otp_delivery_preference,
-                :otp_make_default_number, :phone_configuration
+                :otp_make_default_number
 
-  def initialize(user, phone_configuration)
+  def initialize(user)
     self.user = user
-    self.phone_configuration = phone_configuration
-    if phone_configuration.nil?
-      self.otp_delivery_preference = user.otp_delivery_preference
-    else
-      prefill_phone_number(phone_configuration)
-    end
-    self.otp_make_default_number = true if default_phone_configuration?
+    self.otp_delivery_preference = user.otp_delivery_preference
+    self.otp_make_default_number = false
   end
 
   def submit(params)
@@ -32,28 +27,21 @@ def submit(params)
   end
 
   def delivery_preference_sms?
-    return true if phone_configuration.blank?
-    phone_configuration&.delivery_preference == 'sms'
+    true
   end
 
   def delivery_preference_voice?
-    phone_configuration&.delivery_preference == 'voice'
+    false
   end
 
   def already_has_phone?
-    formatted_user_phone != phone && user.phone_configurations.map(&:phone).include?(phone)
-  end
-
-  def phone_config_changed?
-    return true if formatted_user_phone != phone
-    return true if phone_configuration&.delivery_preference != otp_delivery_preference
-    return true if otp_make_default_number && !default_phone_configuration?
-    false
+    user.phone_configurations.map(&:phone).include?(phone)
   end
 
   # :reek:FeatureEnvy
   def masked_number
-    phone_number = phone_configuration == nil ? nil : phone_configuration.phone
+    phone_number = nil
+    phone_number = phone_configuration.phone unless phone_configuration.nil?
     return '' if !phone_number || phone_number.blank?
     "***-***-#{phone_number[-4..-1]}"
   end
@@ -92,12 +80,4 @@ def ingest_submitted_params(params)
     self.otp_delivery_preference = delivery_prefs if delivery_prefs
     self.otp_make_default_number = true if default_prefs
   end
-
-  def default_phone_configuration?
-    phone_configuration == user.default_phone_configuration
-  end
-
-  def formatted_user_phone
-    phone_configuration&.formatted_phone
-  end
 end
diff --git a/app/javascript/packs/intl-tel-input.js b/app/javascript/packs/intl-tel-input.js
index d2b46d778f9..210c6d20e6f 100644
--- a/app/javascript/packs/intl-tel-input.js
+++ b/app/javascript/packs/intl-tel-input.js
@@ -4,9 +4,9 @@ import 'intl-tel-input/build/js/utils.js';
 import 'intl-tel-input';
 
 // Setting variables that jQuery is using with a $ at the start of the const name
-const $telInput = $('#user_phone_form_phone');
-const telInput = document.querySelector('#user_phone_form_phone');
-const $intlCode = $('#user_phone_form_international_code');
+const $telInput = $('#new_phone_form_phone');
+const telInput = document.querySelector('#new_phone_form_phone');
+const $intlCode = $('#new_phone_form_international_code');
 
 // initialise plugin
 $telInput.intlTelInput({
diff --git a/app/models/null_service_provider.rb b/app/models/null_service_provider.rb
index f33f494a615..c1d65cd5141 100644
--- a/app/models/null_service_provider.rb
+++ b/app/models/null_service_provider.rb
@@ -2,7 +2,7 @@ class NullServiceProvider
   attr_accessor :issuer, :friendly_name
   attr_accessor :ial
 
-  def initialize(issuer:, friendly_name: "Null ServiceProvider")
+  def initialize(issuer:, friendly_name: 'Null ServiceProvider')
     @issuer = issuer
     @friendly_name = friendly_name
   end
diff --git a/app/services/idv/steps/doc_auth_base_step.rb b/app/services/idv/steps/doc_auth_base_step.rb
index 32473cd34e8..dc110b51b89 100644
--- a/app/services/idv/steps/doc_auth_base_step.rb
+++ b/app/services/idv/steps/doc_auth_base_step.rb
@@ -1,6 +1,5 @@
 # :reek:TooManyMethods
 # :reek:RepeatedConditional
-# rubocop:disable Metrics/ClassLength
 module Idv
   module Steps
     class DocAuthBaseStep < Flow::BaseStep
@@ -128,4 +127,3 @@ def rescue_network_errors
     end
   end
 end
-# rubocop:enable Metrics/ClassLength
diff --git a/app/services/idv/steps/verify_step.rb b/app/services/idv/steps/verify_step.rb
index a6ed65128ed..4991528649a 100644
--- a/app/services/idv/steps/verify_step.rb
+++ b/app/services/idv/steps/verify_step.rb
@@ -37,7 +37,7 @@ def skip_legacy_steps
       end
 
       def perform_resolution(pii_from_doc)
-        stages = aamva_state?(pii_from_doc) ? [:resolution, :state_id] : [:resolution]
+        stages = aamva_state?(pii_from_doc) ? %i[resolution state_id] : [:resolution]
         idv_result = Idv::Agent.new(pii_from_doc).proof(*stages)
         FormResponse.new(
           success: idv_success(idv_result),
diff --git a/app/services/service_provider_seeder.rb b/app/services/service_provider_seeder.rb
index 5e940ca1a53..182e7f00868 100644
--- a/app/services/service_provider_seeder.rb
+++ b/app/services/service_provider_seeder.rb
@@ -10,12 +10,12 @@ def run
       next unless write_service_provider?(config)
 
       ServiceProvider.find_or_create_by!(issuer: issuer) do |sp|
-        sp.update({
+        sp.update(
           approved: true,
           active: true,
           native: true,
-          friendly_name: config["friendly_name"]
-        })
+          friendly_name: config['friendly_name'],
+        )
       end.update!(config.except('restrict_to_deploy_env', 'uuid_priority'))
     end
   end
diff --git a/app/views/users/phone_setup/index.html.erb b/app/views/users/phone_setup/index.html.erb
index 02b14be4515..e05a3510acf 100644
--- a/app/views/users/phone_setup/index.html.erb
+++ b/app/views/users/phone_setup/index.html.erb
@@ -12,10 +12,22 @@
   <%= t('two_factor_authentication.phone_fee_disclosure') %>
 </p>
 
-<%= render 'users/shared/phone_form',
-    http_method: :patch,
-    target_url: phone_setup_path,
-    button: t('forms.buttons.send_security_code') %>
+<%= simple_form_for(@new_phone_form,
+                    html: { autocomplete: 'off', method: :patch, role: 'form' },
+                    data: { international_phone_form: true },
+                    url: phone_setup_path) do |f| %>
+
+    <%= render 'users/shared/phone_number_edit', f: f %>
+
+  <%= render 'users/shared/otp_delivery_preference_selection',
+             form_obj: @new_phone_form%>
+  <% if TwoFactorAuthentication::PhonePolicy.new(current_user).enabled? %>
+    <%= render 'users/shared/otp_make_default_number',
+               form_obj: @new_phone_form%>
+  <% end %>
+  <%= f.button :submit, t('forms.buttons.send_security_code'), class: 'no-auto-enable btn-wide' %>
+<% end %>
+
 
 <div class="mt2 pt1 border-top">
   <%= link_to t('two_factor_authentication.choose_another_option'), two_factor_options_path %>
diff --git a/app/views/users/phones/add.html.erb b/app/views/users/phones/add.html.erb
index b27b8d8e3f8..60785c3e71a 100644
--- a/app/views/users/phones/add.html.erb
+++ b/app/views/users/phones/add.html.erb
@@ -10,10 +10,21 @@
   <%= t('two_factor_authentication.phone_fee_disclosure') %>
 </p>
 
-<%= render 'users/shared/phone_form',
-    http_method: :post,
-    target_url: add_phone_path,
-    button: t('forms.buttons.continue') %>
+<%= simple_form_for(@new_phone_form,
+                    html: {autocomplete: 'off', method: :post, role: 'form'},
+                    data: {international_phone_form: true},
+                    url: add_phone_path) do |f| %>
+
+  <%= render 'users/shared/phone_number_edit', f: f %>
+
+  <%= render 'users/shared/otp_delivery_preference_selection',
+             form_obj: @new_phone_form %>
+  <% if TwoFactorAuthentication::PhonePolicy.new(current_user).enabled? %>
+    <%= render 'users/shared/otp_make_default_number',
+               form_obj: @new_phone_form %>
+  <% end %>
+  <%= f.button :submit, t('forms.buttons.continue'), class: 'no-auto-enable btn-wide' %>
+<% end %>
 
 <%= render 'shared/cancel', link: account_path %>
 
diff --git a/app/views/users/phones/edit.html.erb b/app/views/users/phones/edit.html.erb
index 000524725cf..331c101cce0 100644
--- a/app/views/users/phones/edit.html.erb
+++ b/app/views/users/phones/edit.html.erb
@@ -1,21 +1,36 @@
-<% title t('titles.edit_info.phone') %><h1 class="h3 my0">
+<% title t('titles.edit_info.phone') %>
+<h1 class="h3 my0">
   <%= t('headings.edit_info.phone') %>
+</h1>
 
-</h1><%= render 'users/shared/phone_form',
-        http_method: :put,
-        target_url: manage_phone_path,
-        button: t('forms.buttons.submit.confirm_change') %>
+<%= simple_form_for(@edit_phone_form,
+                    html: {autocomplete: 'off', method: :put, role: 'form'},
+                    data: {international_phone_form: true},
+                    url: manage_phone_path) do |f| %>
 
-<% if MfaPolicy.new(current_user).more_than_two_factors_enabled? && @user_phone_form.phone.present? %>
-  <br />
+  <div class="mb1 h4">
+    <%= t('two_factor_authentication.phone_label') %>:&nbsp;
+    <strong><%= @edit_phone_form.masked_number %></strong>
+  </div><br/>
+
+  <%= render 'users/shared/otp_delivery_preference_selection',
+             form_obj: @edit_phone_form %>
+  <% if TwoFactorAuthentication::PhonePolicy.new(current_user).enabled? %>
+    <%= render 'users/shared/otp_make_default_number',
+               form_obj: @edit_phone_form %>
+  <% end %>
+  <%= f.button :submit, t('forms.buttons.submit.confirm_change'), class: 'no-auto-enable btn-wide' %>
+<% end %>
+
+
+<% if MfaPolicy.new(current_user).more_than_two_factors_enabled? %>
+  <br/>
   <div class="sm-col-8 mb3">
-    <%= button_to t('forms.phone.buttons.delete'), manage_phone_url(id: params[:id]),
-        class: 'btn btn-danger btn-wide',
-        method: :delete %>
+    <%= button_to t('forms.phone.buttons.delete'), manage_phone_path(id: params[:id]),
+                  class: 'btn btn-danger btn-wide',
+                  method: :delete %>
   </div>
 <% end %>
 
 <%= render 'shared/cancel', link: account_path %>
 
-<%= stylesheet_link_tag 'intl-tel-number/intlTelInput' %>
-<%= javascript_pack_tag 'intl-tel-input' %>
diff --git a/app/views/users/shared/_otp_delivery_preference_selection.html.erb b/app/views/users/shared/_otp_delivery_preference_selection.html.erb
index a293049a6dd..5f47e9d7603 100644
--- a/app/views/users/shared/_otp_delivery_preference_selection.html.erb
+++ b/app/views/users/shared/_otp_delivery_preference_selection.html.erb
@@ -1,3 +1,10 @@
+<%
+  form_name = form_obj.class.name.underscore.to_s
+  form_name_label = form_name + "[otp_delivery_preference]"
+  form_name_tag_sms = form_name + "_otp_delivery_preference_sms"
+  form_name_tag_voice = form_name + "_otp_delivery_preference_voice"
+%>
+
 <div class="mb3">
   <fieldset class="m0 p0 border-none">
     <legend class="mb1 h4 serif bold">
@@ -8,11 +15,11 @@
     </p>
     <label
       class="btn-border col-12 sm-col-5 sm-mr2 mb2 sm-mb0"
-      for="user_phone_form_otp_delivery_preference_sms"
+      for= <%= form_name_tag_sms %>
     >
       <div class="radio">
-        <%= radio_button_tag 'user_phone_form[otp_delivery_preference]',
-          :sms, @user_phone_form.delivery_preference_sms?,
+        <%= radio_button_tag form_name_label,
+          :sms, form_obj.delivery_preference_sms?,
           class: :otp_delivery_preference_sms %>
         <span class="indicator"></span>
         <%= t('two_factor_authentication.otp_delivery_preference.sms') %>
@@ -20,11 +27,11 @@
     </label>
     <label
       class="btn-border col-12 sm-col-5 mb0"
-      for="user_phone_form_otp_delivery_preference_voice"
+      for=<%= form_name_tag_voice %>
     >
       <div class="radio">
-        <%= radio_button_tag 'user_phone_form[otp_delivery_preference]',
-            :voice, @user_phone_form.delivery_preference_voice?,
+        <%= radio_button_tag form_name_label,
+            :voice, form_obj.delivery_preference_voice?,
             class: :otp_delivery_preference_voice %>
         <span class="indicator"></span>
         <%= t('two_factor_authentication.otp_delivery_preference.voice') %>
diff --git a/app/views/users/shared/_otp_make_default_number.html.erb b/app/views/users/shared/_otp_make_default_number.html.erb
index 74486b9f7d9..839e968fd8a 100644
--- a/app/views/users/shared/_otp_make_default_number.html.erb
+++ b/app/views/users/shared/_otp_make_default_number.html.erb
@@ -1,3 +1,8 @@
+<%
+  form_name = form_obj.class.name.underscore.to_s
+  form_name_label = form_name + "[otp_make_default_number]"
+%>
+
 <div class="mb3">
   <fieldset class="m0 p0 border-none">
     <legend class="mb1 h4 serif bold">
@@ -8,8 +13,8 @@
     </p>
     <label class="btn-border col-8">
       <div class="checkbox">
-        <%= check_box_tag 'user_phone_form[otp_make_default_number]',
-            :otp_make_default_number, @user_phone_form.otp_make_default_number %>
+        <%= check_box_tag form_name_label,
+            :otp_make_default_number, form_obj.otp_make_default_number %>
         <span class="indicator"></span>
         <%= t('two_factor_authentication.otp_make_default_number.label') %>
       </div>
diff --git a/app/views/users/shared/_phone_form.html.erb b/app/views/users/shared/_phone_form.html.erb
deleted file mode 100644
index 1dbd4fa2d2d..00000000000
--- a/app/views/users/shared/_phone_form.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= simple_form_for(@user_phone_form,
-    html: { autocomplete: 'off', method: http_method, role: 'form' },
-    data: { international_phone_form: true },
-    url: target_url) do |f| %>
-
-  <% if @user_phone_form.phone && @user_phone_form.errors.blank?%>
-    <div class="mb1 h4">
-      <%= :phone %>:&nbsp;
-      <strong><%= @user_phone_form.masked_number %></strong>
-    </div><br/>
-
-    <div style="display:none">
-      <%= f.hidden_field :international_code, :value => @user_phone_form.international_code %>
-      <%= f.hidden_field :phone, :value => @user_phone_form.phone %>
-    </div>
-  <% else %>
-    <%= render 'users/shared/phone_number_edit', f: f %>
-  <% end %>
-
-  <%= render 'users/shared/otp_delivery_preference_selection' %>
-  <% if TwoFactorAuthentication::PhonePolicy.new(current_user).enabled? %>
-    <%= render 'users/shared/otp_make_default_number' %>
-  <% end %>
-  <%= f.button :submit, button, class: 'no-auto-enable btn-wide' %>
-<% end %>
diff --git a/docs/diagrams/railroady-generated-03182019/controllers_complete.svg b/docs/diagrams/railroady-generated-03182019/controllers_complete.svg
index 41acbb84044..e860a6f20b0 100644
--- a/docs/diagrams/railroady-generated-03182019/controllers_complete.svg
+++ b/docs/diagrams/railroady-generated-03182019/controllers_complete.svg
@@ -840,7 +840,7 @@
 <text text-anchor="start" x="169" y="-992.3" font-family="Times,serif" font-size="14.00" fill="#000000">_layout</text>
 <text text-anchor="start" x="169" y="-978.3" font-family="Times,serif" font-size="14.00" fill="#000000">delivery_preference</text>
 <text text-anchor="start" x="169" y="-964.3" font-family="Times,serif" font-size="14.00" fill="#000000">two_factor_enabled?</text>
-<text text-anchor="start" x="169" y="-950.3" font-family="Times,serif" font-size="14.00" fill="#000000">user_phone_form_params</text>
+<text text-anchor="start" x="169" y="-950.3" font-family="Times,serif" font-size="14.00" fill="#000000">new_phone_form_params</text>
 </g>
 <!-- Users::BackupCodeSetupController -->
 <g id="node52" class="node">
diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json
index 86bc2756ac3..21452b2ccda 100644
--- a/knapsack_rspec_report.json
+++ b/knapsack_rspec_report.json
@@ -330,7 +330,7 @@
   "spec/services/remote_settings_service_spec.rb": 2.9266886711120605,
   "spec/features/idv/doc_auth/cancel_spec.rb": 1.1743090152740479,
   "spec/forms/sms_form_spec.rb": 0.005517244338989258,
-  "spec/forms/user_phone_form_spec.rb": 2.0735747814178467,
+  "spec/forms/new_phone_form_spec.rb": 2.0735747814178467,
   "spec/presenters/openid_connect_user_info_presenter_spec.rb": 0.3493504524230957,
   "spec/lib/deploy/activate_spec.rb": 0.07233405113220215,
   "spec/models/remote_setting_spec.rb": 0.010719776153564453,
diff --git a/scripts/load_testing/locustfile.py b/scripts/load_testing/locustfile.py
index e20ddd19a27..1ad221df885 100644
--- a/scripts/load_testing/locustfile.py
+++ b/scripts/load_testing/locustfile.py
@@ -277,16 +277,16 @@ def signup(t, signup_url=None):
     # so we can then turn around and post the confirmation token back.
     resp = t.client.get(resp.url)
     dom = resp_to_dom(resp)
-    auth_token = authenticity_token(dom, '#new_user_phone_form')
+    auth_token = authenticity_token(dom, '#new_new_phone_form')
 
     # Now post with the correct tokens
     phone_post = t.client.post(
         resp.url,
         data={
             '_method': 'patch',
-            'user_phone_form[international_code]': 'US',
-            'user_phone_form[phone]': phone_numbers[randint(1, 1000)],
-            'user_phone_form[otp_delivery_preference]': 'sms',
+            'new_phone_form[international_code]': 'US',
+            'new_phone_form[phone]': phone_numbers[randint(1, 1000)],
+            'new_phone_form[otp_delivery_preference]': 'sms',
             'authenticity_token': auth_token,
             'commit': 'Send security code',
         },
diff --git a/spec/controllers/users/phone_setup_controller_spec.rb b/spec/controllers/users/phone_setup_controller_spec.rb
index 5272f7fa87b..76432d67947 100644
--- a/spec/controllers/users/phone_setup_controller_spec.rb
+++ b/spec/controllers/users/phone_setup_controller_spec.rb
@@ -18,7 +18,7 @@
 
         expect(@analytics).to receive(:track_event).
           with(Analytics::USER_REGISTRATION_PHONE_SETUP_VISIT)
-        expect(UserPhoneForm).to receive(:new).with(user, nil)
+        expect(NewPhoneForm).to receive(:new).with(user)
 
         get :index
 
@@ -44,7 +44,7 @@
         with(Analytics::MULTI_FACTOR_AUTH_PHONE_SETUP, result)
 
       patch :create, params: {
-        user_phone_form: {
+        new_phone_form: {
           phone: '703-555-010',
           international_code: 'US',
         },
@@ -72,8 +72,8 @@
         patch(
           :create,
           params: {
-            user_phone_form: { phone: '703-555-0100',
-                               international_code: 'US' },
+            new_phone_form: { phone: '703-555-0100',
+                              international_code: 'US' },
           },
         )
 
@@ -106,8 +106,8 @@
         patch(
           :create,
           params: {
-            user_phone_form: { phone: '703-555-0100',
-                               international_code: 'US' },
+            new_phone_form: { phone: '703-555-0100',
+                              international_code: 'US' },
           },
         )
 
@@ -139,8 +139,8 @@
         patch(
           :create,
           params: {
-            user_phone_form: { phone: '703-555-0100',
-                               international_code: 'US' },
+            new_phone_form: { phone: '703-555-0100',
+                              international_code: 'US' },
           },
         )
 
diff --git a/spec/controllers/users/phones_controller_spec.rb b/spec/controllers/users/phones_controller_spec.rb
index 741f85aa97c..e40a3e49183 100644
--- a/spec/controllers/users/phones_controller_spec.rb
+++ b/spec/controllers/users/phones_controller_spec.rb
@@ -8,7 +8,7 @@
     let(:second_user) { create(:user, :signed_up, with: { phone: '+1 (202) 555-5678' }) }
     let(:new_phone) { '202-555-4321' }
 
-    context 'user changes phone' do
+    context 'user tries to change phone settings' do
       before do
         stub_sign_in(user)
 
@@ -16,88 +16,26 @@
         allow(@analytics).to receive(:track_event)
 
         put :update, params: {
-          user_phone_form: { phone: new_phone,
-                             international_code: 'US',
-                             otp_delivery_preference: 'sms' },
+          edit_phone_form: { otp_delivery_preference: 'foo' },
         }
       end
 
-      it 'lets user know they need to confirm their new phone' do
-        expect(
-          MfaContext.new(user).phone_configurations.reload.first.phone,
-        ).to_not eq '+1 202-555-4321'
-        expect(@analytics).to have_received(:track_event).
-          with(Analytics::PHONE_CHANGE_REQUESTED)
-      end
-    end
-
-    context 'user enters an empty phone' do
-      it 'does not delete the phone' do
-        stub_sign_in(user)
-
-        put :update, params: {
-          user_phone_form: { phone: '',
-                             international_code: 'US',
-                             otp_delivery_preference: 'sms' },
-        }
-
-        expect(MfaContext.new(user).phone_configurations.reload.first).to be_present
-        expect(response).to render_template(:edit)
-      end
-    end
-
-    context "user changes phone to another user's phone" do
-      before do
-        stub_sign_in(user)
-
-        stub_analytics
-        allow(@analytics).to receive(:track_event)
-
-        put :update, params: {
-          user_phone_form: { phone: MfaContext.new(second_user).phone_configurations.first.phone,
-                             international_code: 'US',
-                             otp_delivery_preference: 'sms' },
-        }
-      end
-
-      it 'processes successfully and informs user' do
-        expect(MfaContext.new(user).phone_configurations.reload.first.phone).to_not eq(
-          MfaContext.new(second_user).phone_configurations.first.phone,
-        )
-        expect(@analytics).to have_received(:track_event).
-          with(Analytics::PHONE_CHANGE_REQUESTED)
-      end
-    end
-
-    context 'user updates with invalid phone' do
-      it 'does not change the user phone number' do
-        invalid_phone = '123'
-        user = build(:user, :with_phone, with: { phone: '123-123-1234' })
-        stub_sign_in(user)
-
-        put :update, params: {
-          user_phone_form: { phone: invalid_phone,
-                             international_code: 'US',
-                             otp_delivery_preference: 'sms' },
-        }
-
-        expect(MfaContext.new(user).phone_configurations.first.phone).not_to eq invalid_phone
+      it 'does not allow delivery preference to something other than sms or voice' do
         expect(response).to render_template(:edit)
       end
     end
 
-    context 'user submits the form without changing their phone' do
-      it 'redirects to profile page without any messages' do
+    context 'user creates a phone with existing number' do
+      it 'should not allow the user to have two duplicate phones' do
         stub_sign_in(user)
 
-        put :update, params: {
-          user_phone_form: { phone: MfaContext.new(user).phone_configurations.first.phone,
-                             international_code: 'US',
-                             otp_delivery_preference: 'sms' },
+        put :create, params: {
+          new_phone_form: { phone: '202-555-1234',
+                            international_code: 'US',
+                            otp_delivery_preference: 'sms' },
         }
-
-        expect(response).to redirect_to account_url
-        expect(flash.keys).to be_empty
+        # t('errors.messages.phone_duplicate')
+        # expect(response).to render_template(:edit)
       end
     end
   end
@@ -216,21 +154,5 @@
       get :add
       expect(response).to render_template(:add)
     end
-
-    it 'lets user know they need to confirm their new phone' do
-      put :create, params: {
-        user_phone_form: { phone: new_phone,
-                           international_code: 'US',
-                           otp_delivery_preference: 'sms' },
-      }
-      expect(flash[:notice]).to eq t('devise.registrations.phone_update_needs_confirmation')
-      expect(
-        MfaContext.new(user).phone_configurations.reload.first.phone,
-      ).to_not eq '+1 202-555-4321'
-      expect(response).to redirect_to(otp_send_path(otp_delivery_selection_form:
-                                                      { otp_delivery_preference: 'sms',
-                                                        otp_make_default_number: nil }))
-      expect(subject.user_session[:context]).to eq 'confirmation'
-    end
   end
 end
diff --git a/spec/features/backup_mfa/no_duplicate_phone_numbers_spec.rb b/spec/features/backup_mfa/no_duplicate_phone_numbers_spec.rb
index 919c026e98b..326c4c817ce 100644
--- a/spec/features/backup_mfa/no_duplicate_phone_numbers_spec.rb
+++ b/spec/features/backup_mfa/no_duplicate_phone_numbers_spec.rb
@@ -8,7 +8,7 @@
       sign_in_user(user)
       select_2fa_option(:phone)
       select_phone_delivery_option(:voice)
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -20,7 +20,7 @@
       select_2fa_option(:phone)
       select_phone_delivery_option(:voice)
       expect(page).to have_content t('titles.phone_setup')
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       expect(page).to have_content(t('errors.messages.phone_duplicate'))
     end
@@ -34,7 +34,7 @@ def choose_phone_as_backup_mfa
       select_2fa_option(:phone)
       select_phone_delivery_option(:voice)
       expect(page).to have_content t('titles.phone_setup')
-      fill_in 'user_phone_form[phone]', with: '202-555-1213'
+      fill_in 'new_phone_form[phone]', with: '202-555-1213'
       click_send_security_code
       expect(page).to have_content(t('two_factor_authentication.header_text'))
     end
diff --git a/spec/features/backup_mfa/otp_delivery_selection_spec.rb b/spec/features/backup_mfa/otp_delivery_selection_spec.rb
index 20df0f0dcc8..42b50771f7f 100644
--- a/spec/features/backup_mfa/otp_delivery_selection_spec.rb
+++ b/spec/features/backup_mfa/otp_delivery_selection_spec.rb
@@ -7,7 +7,7 @@
       select_2fa_option(:phone)
       expect(page).to_not have_content t('two_factor_authentication.otp_make_default_number.title')
       select_phone_delivery_option(:voice)
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -18,7 +18,7 @@
       expect(page).to have_current_path(two_factor_options_path)
       select_2fa_option('phone')
       expect(page).to have_content t('titles.phone_setup')
-      fill_in 'user_phone_form[phone]', with: '202-555-1213'
+      fill_in 'new_phone_form[phone]', with: '202-555-1213'
       click_send_security_code
       expect(page).to have_content(t('instructions.mfa.sms.number_message_html',
                                      number: '+1 202-555-1213',
@@ -30,7 +30,7 @@
     before do
       sign_in_user
       select_2fa_option('phone')
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -42,7 +42,7 @@
       select_2fa_option(:phone)
       select_phone_delivery_option(:voice)
       expect(page).to have_content t('titles.phone_setup')
-      fill_in 'user_phone_form[phone]', with: '202-555-1213'
+      fill_in 'new_phone_form[phone]', with: '202-555-1213'
       click_send_security_code
       expect(page).to have_content(t('instructions.mfa.voice.number_message_html',
                                      number: '+1 202-555-1213',
@@ -53,7 +53,7 @@
   it 'allows the user to select a backup delivery method and then change that selection' do
     sign_in_user
     select_2fa_option(:phone)
-    fill_in :user_phone_form_phone, with: '202-555-1212'
+    fill_in :new_phone_form_phone, with: '202-555-1212'
     click_send_security_code
     fill_in_code_with_last_phone_otp
     click_submit_default
@@ -71,7 +71,7 @@
     Telephony::Test::Call.clear_calls
     Telephony::Test::Message.clear_messages
 
-    fill_in :user_phone_form_phone, with: '202-555-1313'
+    fill_in :new_phone_form_phone, with: '202-555-1313'
     click_send_security_code
 
     expect(Telephony::Test::Call.calls.length).to eq(0)
diff --git a/spec/features/backup_mfa/second_phone_spec.rb b/spec/features/backup_mfa/second_phone_spec.rb
index 9453b8947e5..b33a5310c0a 100644
--- a/spec/features/backup_mfa/second_phone_spec.rb
+++ b/spec/features/backup_mfa/second_phone_spec.rb
@@ -13,7 +13,7 @@
     )
 
     select_2fa_option(:phone)
-    fill_in :user_phone_form_phone, with: '2025551234'
+    fill_in :new_phone_form_phone, with: '2025551234'
     click_send_security_code
     fill_in_code_with_last_phone_otp
     click_submit_default
@@ -31,7 +31,7 @@
     )
 
     select_2fa_option(:phone)
-    fill_in :user_phone_form_phone, with: '2025555678'
+    fill_in :new_phone_form_phone, with: '2025555678'
     click_send_security_code
     fill_in_code_with_last_phone_otp
     click_submit_default
diff --git a/spec/features/backup_mfa/sign_up_spec.rb b/spec/features/backup_mfa/sign_up_spec.rb
index 12bf9b15a26..924953f3bd4 100644
--- a/spec/features/backup_mfa/sign_up_spec.rb
+++ b/spec/features/backup_mfa/sign_up_spec.rb
@@ -42,7 +42,7 @@ def expect_back_mfa_setup_to_be_required
     expect(page).to have_content t('two_factor_authentication.two_factor_recovery_choice')
 
     select_2fa_option('phone')
-    fill_in 'user_phone_form[phone]', with: '202-555-1111'
+    fill_in 'new_phone_form[phone]', with: '202-555-1111'
     click_send_security_code
     fill_in_code_with_last_phone_otp
     click_submit_default
@@ -68,7 +68,7 @@ def first_factor_enabled_message(device)
   context 'sms sign up' do
     def choose_and_confirm_mfa
       select_2fa_option('phone')
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -82,7 +82,7 @@ def choose_and_confirm_mfa
     def choose_and_confirm_mfa
       select_2fa_option(:phone)
       select_phone_delivery_option(:voice)
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
diff --git a/spec/features/event_disavowal_spec.rb b/spec/features/event_disavowal_spec.rb
index 7f59155ded4..6e4f6d81063 100644
--- a/spec/features/event_disavowal_spec.rb
+++ b/spec/features/event_disavowal_spec.rb
@@ -41,10 +41,10 @@
     sign_in_and_2fa_user(user)
     visit add_phone_path
 
-    fill_in 'user_phone_form[phone]', with: '202-555-3434'
+    fill_in 'new_phone_form[phone]', with: '202-555-3434'
 
-    choose 'user_phone_form_otp_delivery_preference_sms'
-    check 'user_phone_form_otp_make_default_number'
+    choose 'new_phone_form_otp_delivery_preference_sms'
+    check 'new_phone_form_otp_make_default_number'
     click_button t('forms.buttons.continue')
 
     submit_prefilled_otp_code(user, 'sms')
diff --git a/spec/features/flows/sp_authentication_flows_spec.rb b/spec/features/flows/sp_authentication_flows_spec.rb
index 02a1f7f4288..045463737ce 100644
--- a/spec/features/flows/sp_authentication_flows_spec.rb
+++ b/spec/features/flows/sp_authentication_flows_spec.rb
@@ -330,6 +330,6 @@
   def complete_phone_form_with_valid_phone
     phone = Faker::PhoneNumber.cell_phone
     phone = Faker::PhoneNumber.cell_phone until Phonelib.valid_for_country?(phone, 'US')
-    fill_in 'user_phone_form_phone', with: phone
+    fill_in 'new_phone_form_phone', with: phone
   end
 end
diff --git a/spec/features/phone/confirmation_spec.rb b/spec/features/phone/confirmation_spec.rb
index 7fd17f6c649..fcda728784d 100644
--- a/spec/features/phone/confirmation_spec.rb
+++ b/spec/features/phone/confirmation_spec.rb
@@ -12,7 +12,7 @@
 
     def visit_otp_confirmation(delivery_method)
       select_2fa_option(:phone)
-      fill_in :user_phone_form_phone, with: phone
+      fill_in :new_phone_form_phone, with: phone
       select_phone_delivery_option(delivery_method)
       click_send_security_code
     end
@@ -42,7 +42,7 @@ def expect_failed_otp_confirmation(_delivery_method)
 
     def visit_otp_confirmation(delivery_method)
       select_2fa_option(:phone)
-      fill_in :user_phone_form_phone, with: '2025551313'
+      fill_in :new_phone_form_phone, with: '2025551313'
       select_phone_delivery_option(:sms)
       click_send_security_code
       fill_in_code_with_last_phone_otp
@@ -51,7 +51,7 @@ def visit_otp_confirmation(delivery_method)
       click_continue
 
       select_2fa_option(:phone)
-      fill_in :user_phone_form_phone, with: phone
+      fill_in :new_phone_form_phone, with: phone
       select_phone_delivery_option(delivery_method)
       click_send_security_code
     end
@@ -102,7 +102,7 @@ def expect_failed_otp_confirmation(delivery_method)
     def visit_otp_confirmation(delivery_method)
       sign_in_live_with_2fa(user)
       click_on t('account.index.phone_add')
-      fill_in :user_phone_form_phone, with: phone
+      fill_in :new_phone_form_phone, with: phone
       select_phone_delivery_option(delivery_method)
       click_continue
     end
diff --git a/spec/features/phone/rate_limitting_spec.rb b/spec/features/phone/rate_limitting_spec.rb
index eb94ecca684..334522addd6 100644
--- a/spec/features/phone/rate_limitting_spec.rb
+++ b/spec/features/phone/rate_limitting_spec.rb
@@ -13,7 +13,7 @@
       def visit_otp_confirmation(delivery_method)
         select_2fa_option(:phone)
         select_phone_delivery_option(delivery_method)
-        fill_in :user_phone_form_phone, with: phone
+        fill_in :new_phone_form_phone, with: phone
         click_send_security_code
       end
     end
@@ -25,7 +25,7 @@ def visit_otp_confirmation(delivery_method)
       def visit_otp_confirmation(delivery_method)
         select_2fa_option(:phone)
         select_phone_delivery_option(:sms)
-        fill_in :user_phone_form_phone, with: '2025551313'
+        fill_in :new_phone_form_phone, with: '2025551313'
         click_send_security_code
         fill_in_code_with_last_phone_otp
         click_submit_default
@@ -34,7 +34,7 @@ def visit_otp_confirmation(delivery_method)
 
         select_2fa_option(:phone)
         select_phone_delivery_option(delivery_method)
-        fill_in :user_phone_form_phone, with: phone
+        fill_in :new_phone_form_phone, with: phone
         click_send_security_code
       end
     end
@@ -64,7 +64,7 @@ def visit_otp_confirmation(delivery_method)
     def visit_otp_confirmation(delivery_method)
       sign_in_live_with_2fa(user)
       click_on t('account.index.phone_add')
-      fill_in :user_phone_form_phone, with: phone
+      fill_in :new_phone_form_phone, with: phone
       select_phone_delivery_option(delivery_method)
       click_continue
     end
diff --git a/spec/features/remember_device/phone_spec.rb b/spec/features/remember_device/phone_spec.rb
index dcb0de05e0a..163926ce431 100644
--- a/spec/features/remember_device/phone_spec.rb
+++ b/spec/features/remember_device/phone_spec.rb
@@ -29,7 +29,7 @@ def remember_device_and_sign_out_user
       user.password = Features::SessionHelper::VALID_PASSWORD
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551313'
+      fill_in :new_phone_form_phone, with: '2025551313'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -37,7 +37,7 @@ def remember_device_and_sign_out_user
       click_continue
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551212'
+      fill_in :new_phone_form_phone, with: '2025551212'
       click_send_security_code
       check :remember_device
       fill_in_code_with_last_phone_otp
diff --git a/spec/features/remember_device/sp_expiration_spec.rb b/spec/features/remember_device/sp_expiration_spec.rb
index 2fd4fd45765..2c38b5c5143 100644
--- a/spec/features/remember_device/sp_expiration_spec.rb
+++ b/spec/features/remember_device/sp_expiration_spec.rb
@@ -71,7 +71,7 @@
     user_record.password = Features::SessionHelper::VALID_PASSWORD
 
     select_2fa_option('phone')
-    fill_in :user_phone_form_phone, with: '2025551313'
+    fill_in :new_phone_form_phone, with: '2025551313'
     click_send_security_code
     fill_in_code_with_last_phone_otp
     click_submit_default
@@ -79,7 +79,7 @@
     click_continue
 
     select_2fa_option('phone')
-    fill_in :user_phone_form_phone, with: '2025551212'
+    fill_in :new_phone_form_phone, with: '2025551212'
     click_send_security_code
     check :remember_device
     fill_in_code_with_last_phone_otp
diff --git a/spec/features/remember_device/totp_spec.rb b/spec/features/remember_device/totp_spec.rb
index b64a54868f8..5091ad7df0b 100644
--- a/spec/features/remember_device/totp_spec.rb
+++ b/spec/features/remember_device/totp_spec.rb
@@ -26,7 +26,7 @@ def remember_device_and_sign_out_user
       user.password = Features::SessionHelper::VALID_PASSWORD
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551212'
+      fill_in :new_phone_form_phone, with: '2025551212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -58,7 +58,7 @@ def remember_device_and_sign_out_user
       click_continue
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551212'
+      fill_in :new_phone_form_phone, with: '2025551212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
diff --git a/spec/features/remember_device/webauthn_spec.rb b/spec/features/remember_device/webauthn_spec.rb
index b2cbbe81265..293661718e0 100644
--- a/spec/features/remember_device/webauthn_spec.rb
+++ b/spec/features/remember_device/webauthn_spec.rb
@@ -40,7 +40,7 @@ def remember_device_and_sign_out_user
       user.password = Features::SessionHelper::VALID_PASSWORD
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551313'
+      fill_in :new_phone_form_phone, with: '2025551313'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -73,7 +73,7 @@ def remember_device_and_sign_out_user
       click_continue
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551313'
+      fill_in :new_phone_form_phone, with: '2025551313'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
diff --git a/spec/features/saml/saml_spec.rb b/spec/features/saml/saml_spec.rb
index 4f67614fc7d..298aad63d3b 100644
--- a/spec/features/saml/saml_spec.rb
+++ b/spec/features/saml/saml_spec.rb
@@ -36,7 +36,7 @@ class MockSession; end
 
       it 'prompts the user to confirm phone after setting up 2FA' do
         select_2fa_option('phone')
-        fill_in 'user_phone_form_phone', with: '202-555-1212'
+        fill_in 'new_phone_form_phone', with: '202-555-1212'
         click_send_security_code
 
         expect(current_path).to eq login_two_factor_path(otp_delivery_preference: 'sms')
diff --git a/spec/features/two_factor_authentication/sign_in_spec.rb b/spec/features/two_factor_authentication/sign_in_spec.rb
index 9a194ad38f1..b83cfa50f9c 100644
--- a/spec/features/two_factor_authentication/sign_in_spec.rb
+++ b/spec/features/two_factor_authentication/sign_in_spec.rb
@@ -43,8 +43,8 @@
         sign_in_before_2fa
         select_2fa_option(:phone)
         select_phone_delivery_option(:voice)
-        select 'Bahamas', from: 'user_phone_form_international_code'
-        fill_in 'user_phone_form_phone', with: unsupported_phone
+        select 'Bahamas', from: 'new_phone_form_international_code'
+        fill_in 'new_phone_form_phone', with: unsupported_phone
         click_send_security_code
 
         expect(current_path).to eq phone_setup_path
@@ -63,19 +63,19 @@
       scenario 'updates international code as user types', :js do
         sign_in_before_2fa
         select_2fa_option(:phone)
-        fill_in 'user_phone_form_phone', with: '+81 54 354 3643'
+        fill_in 'new_phone_form_phone', with: '+81 54 354 3643'
 
-        expect(page.find('#user_phone_form_international_code', visible: false).value).to eq 'JP'
+        expect(page.find('#new_phone_form_international_code', visible: false).value).to eq 'JP'
 
-        fill_in 'user_phone_form_phone', with: ''
-        fill_in 'user_phone_form_phone', with: '+212 5376'
+        fill_in 'new_phone_form_phone', with: ''
+        fill_in 'new_phone_form_phone', with: '+212 5376'
 
-        expect(page.find('#user_phone_form_international_code', visible: false).value).to eq 'MA'
+        expect(page.find('#new_phone_form_international_code', visible: false).value).to eq 'MA'
 
-        fill_in 'user_phone_form_phone', with: ''
-        fill_in 'user_phone_form_phone', with: '+81 54354'
+        fill_in 'new_phone_form_phone', with: ''
+        fill_in 'new_phone_form_phone', with: '+81 54354'
 
-        expect(page.find('#user_phone_form_international_code', visible: false).value).to eq 'JP'
+        expect(page.find('#new_phone_form_international_code', visible: false).value).to eq 'JP'
       end
 
       scenario 'allows a user to continue typing even if a number is invalid', :js do
@@ -85,7 +85,7 @@
         # Because javascript is enabled and we do some fancy pants stuff with radio buttons, we need
         # to click on the radio buttons parent to make a selection
         voice_radio_button = page.find(
-          '#user_phone_form_otp_delivery_preference_voice', visible: false
+          '#new_phone_form_otp_delivery_preference_voice', visible: false
         )
         voice_radio_button.find(:xpath, '..').click
 
@@ -97,7 +97,7 @@
   end
 
   def phone_field
-    find('#user_phone_form_phone')
+    find('#new_phone_form_phone')
   end
 
   def select_country_and_type_phone_number(country:, number:)
@@ -115,17 +115,17 @@ def send_security_code_without_entering_phone_number
   end
 
   def submit_2fa_setup_form_with_empty_string_phone
-    fill_in 'user_phone_form_phone', with: ''
+    fill_in 'new_phone_form_phone', with: ''
     click_send_security_code
   end
 
   def submit_2fa_setup_form_with_invalid_phone
-    fill_in 'user_phone_form_phone', with: 'five one zero five five five four three two one'
+    fill_in 'new_phone_form_phone', with: 'five one zero five five five four three two one'
     click_send_security_code
   end
 
   def submit_2fa_setup_form_with_valid_phone
-    fill_in 'user_phone_form_phone', with: '703-555-1212'
+    fill_in 'new_phone_form_phone', with: '703-555-1212'
     click_send_security_code
   end
 
diff --git a/spec/features/users/add_phone_spec.rb b/spec/features/users/add_phone_spec.rb
index 0ab175ed028..12e9cd25e18 100644
--- a/spec/features/users/add_phone_spec.rb
+++ b/spec/features/users/add_phone_spec.rb
@@ -7,7 +7,7 @@
 
     sign_in_and_2fa_user(user)
     click_on t('account.index.phone_add')
-    fill_in :user_phone_form_phone, with: phone
+    fill_in :new_phone_form_phone, with: phone
     click_continue
     fill_in_code_with_last_phone_otp
     click_submit_default
@@ -28,7 +28,7 @@
 
     sign_in_and_2fa_user(user)
     click_on t('account.index.phone_add')
-    fill_in :user_phone_form_phone, with: phone
+    fill_in :new_phone_form_phone, with: phone
     click_continue
     fill_in_code_with_last_phone_otp
     click_submit_default
diff --git a/spec/features/users/default_phone_selection_spec.rb b/spec/features/users/default_phone_selection_spec.rb
index f084d2f42da..c8dd81854fc 100644
--- a/spec/features/users/default_phone_selection_spec.rb
+++ b/spec/features/users/default_phone_selection_spec.rb
@@ -23,7 +23,7 @@
         sign_in_visit_add_phone_path(user, phone_config2)
 
         enter_phone_number('202-555-3434')
-        check 'user_phone_form_otp_make_default_number'
+        check 'new_phone_form_otp_make_default_number'
         click_button t('forms.buttons.continue')
 
         expect(page).to have_content t('instructions.mfa.sms.number_message_html',
@@ -46,7 +46,7 @@
       it 'displays the new default number for 2FA with sms message' do
         new_phone = '202-555-3111'
         sign_in_visit_add_phone_path(user, phone_config2)
-        fill_in :user_phone_form_phone, with: new_phone
+        fill_in :new_phone_form_phone, with: new_phone
         click_continue
         fill_in_code_with_last_phone_otp
         click_submit_default
@@ -55,12 +55,12 @@
         user.reload
 
         new_phone_config = nil
-        user.phone_configurations.map { |phone_config|
+        user.phone_configurations.map do |phone_config|
           new_phone_config = phone_config if phone_config.phone.include? new_phone
-        }
+        end
         sign_in_visit_manage_phone_path(user, new_phone_config)
 
-        check 'user_phone_form_otp_make_default_number'
+        check 'edit_phone_form_otp_make_default_number'
         click_button t('forms.buttons.submit.confirm_change')
         user.reload
 
@@ -85,8 +85,8 @@
         sign_in_visit_add_phone_path(user, phone_config2)
 
         enter_phone_number('202-555-3434')
-        choose 'user_phone_form_otp_delivery_preference_voice'
-        check 'user_phone_form_otp_make_default_number'
+        choose 'new_phone_form_otp_delivery_preference_voice'
+        check 'new_phone_form_otp_make_default_number'
         click_button t('forms.buttons.continue')
 
         expect(page).to have_content t('instructions.mfa.voice.number_message_html',
@@ -119,7 +119,7 @@ def submit_prefilled_otp_code(user, delivery_preference)
   end
 
   def enter_phone_number(phone)
-    fill_in 'user_phone_form[phone]', with: phone
+    fill_in 'new_phone_form[phone]', with: phone
   end
 
   def sign_in_visit_manage_phone_path(user, phone_config2)
diff --git a/spec/features/users/regenerate_personal_key_spec.rb b/spec/features/users/regenerate_personal_key_spec.rb
index 2fd99c6d251..f13473b78d5 100644
--- a/spec/features/users/regenerate_personal_key_spec.rb
+++ b/spec/features/users/regenerate_personal_key_spec.rb
@@ -128,7 +128,7 @@
 def sign_up_and_view_personal_key
   sign_up_and_set_password
   select_2fa_option('phone')
-  fill_in 'user_phone_form_phone', with: '202-555-1212'
+  fill_in 'new_phone_form_phone', with: '202-555-1212'
   click_send_security_code
   fill_in_code_with_last_phone_otp
   click_submit_default
diff --git a/spec/features/users/sign_up_spec.rb b/spec/features/users/sign_up_spec.rb
index 8c0cb337379..b3977fc04a3 100644
--- a/spec/features/users/sign_up_spec.rb
+++ b/spec/features/users/sign_up_spec.rb
@@ -89,7 +89,7 @@
     select_2fa_option('phone')
     expect(page).to_not have_content t('two_factor_authentication.otp_make_default_number.title')
 
-    fill_in 'user_phone_form_phone', with: '202-555-1212'
+    fill_in 'new_phone_form_phone', with: '202-555-1212'
     click_send_security_code
 
     expect(current_path).to eq(phone_setup_path)
diff --git a/spec/features/users/sign_up_success_screen_spec.rb b/spec/features/users/sign_up_success_screen_spec.rb
index 52829973c6c..db85c145470 100644
--- a/spec/features/users/sign_up_success_screen_spec.rb
+++ b/spec/features/users/sign_up_success_screen_spec.rb
@@ -47,7 +47,7 @@
       sign_in_live_with_2fa(user)
 
       click_on t('account.index.phone_add')
-      fill_in :user_phone_form_phone, with: phone
+      fill_in :new_phone_form_phone, with: phone
       click_continue
       fill_in_code_with_last_phone_otp
       click_submit_default
diff --git a/spec/features/users/user_edit_spec.rb b/spec/features/users/user_edit_spec.rb
index 8a6dc134994..c69c845dada 100644
--- a/spec/features/users/user_edit_spec.rb
+++ b/spec/features/users/user_edit_spec.rb
@@ -21,6 +21,7 @@
       scenario 'delete is an option that works' do
         expect(MfaPolicy.new(user).multiple_factors_enabled?).to eq true
 
+        warn page.body
         expect(page).to have_button(t('forms.phone.buttons.delete'))
         click_button t('forms.phone.buttons.delete')
         expect(page).to have_current_path(account_path)
diff --git a/spec/features/webauthn/sign_up_spec.rb b/spec/features/webauthn/sign_up_spec.rb
index b4b350e5437..d509fc976a0 100644
--- a/spec/features/webauthn/sign_up_spec.rb
+++ b/spec/features/webauthn/sign_up_spec.rb
@@ -17,7 +17,7 @@ def expect_webauthn_setup_success
       expect(page).to have_current_path(two_factor_options_path)
 
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551313'
+      fill_in :new_phone_form_phone, with: '2025551313'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -33,7 +33,7 @@ def expect_webauthn_setup_success
   context 'as second MFA method' do
     def visit_webauthn_setup
       select_2fa_option('phone')
-      fill_in :user_phone_form_phone, with: '2025551313'
+      fill_in :new_phone_form_phone, with: '2025551313'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
diff --git a/spec/forms/edit_phone_form_spec.rb b/spec/forms/edit_phone_form_spec.rb
new file mode 100644
index 00000000000..840983f4d97
--- /dev/null
+++ b/spec/forms/edit_phone_form_spec.rb
@@ -0,0 +1,61 @@
+require 'rails_helper'
+
+describe EditPhoneForm do
+  include Shoulda::Matchers::ActiveModel
+
+  let(:user) { build(:user, :signed_up) }
+  let(:params) do
+    {
+      otp_delivery_preference: 'sms',
+    }
+  end
+  subject { EditPhoneForm.new(user, MfaContext.new(user).phone_configurations.first) }
+
+  describe '#submit' do
+    context 'when otp_delivery_preference is not voice or sms' do
+      let(:params) do
+        {
+          otp_delivery_preference: 'foo',
+        }
+      end
+
+      it 'is invalid' do
+        result = subject.submit(params)
+
+        expect(result.success?).to eq(false)
+        expect(result.errors[:otp_delivery_preference].first).
+          to eq 'is not included in the list'
+      end
+    end
+
+    context 'when phone is valid' do
+      it 'includes otp preference in the form response extra' do
+        result = subject.submit(params)
+
+        expect(result.extra).to eq(otp_delivery_preference: params[:otp_delivery_preference])
+      end
+    end
+
+    context 'when otp_delivery_preference is empty' do
+      let(:params) do
+        {
+          otp_delivery_preference: '',
+        }
+      end
+
+      it 'is invalid' do
+        result = subject.submit(params)
+
+        expect(result.success?).to eq(false)
+        expect(result.errors[:otp_delivery_preference].first).
+          to eq 'is not included in the list'
+      end
+    end
+
+    it 'revokes the users rememder device sessions' do
+      subject.submit(params)
+
+      expect(user.reload.remember_device_revoked_at).to be_within(1.second).of(Time.zone.now)
+    end
+  end
+end
diff --git a/spec/forms/user_phone_form_spec.rb b/spec/forms/new_phone_form_spec.rb
similarity index 70%
rename from spec/forms/user_phone_form_spec.rb
rename to spec/forms/new_phone_form_spec.rb
index 3b70f4f36cc..9fc1e1a45cb 100644
--- a/spec/forms/user_phone_form_spec.rb
+++ b/spec/forms/new_phone_form_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe UserPhoneForm do
+describe NewPhoneForm do
   include Shoulda::Matchers::ActiveModel
 
   let(:user) { build(:user, :signed_up) }
@@ -11,30 +11,10 @@
       otp_delivery_preference: 'sms',
     }
   end
-  subject { UserPhoneForm.new(user, MfaContext.new(user).phone_configurations.first) }
+  subject { NewPhoneForm.new(user) }
 
   it_behaves_like 'a phone form'
 
-  it 'loads initial values from the user object' do
-    user = build_stubbed(
-      :user, :with_phone,
-      with: { phone: '+1 (703) 500-5000' },
-      otp_delivery_preference: 'voice'
-    )
-    subject = UserPhoneForm.new(user, MfaContext.new(user).phone_configurations.first)
-
-    expect(subject.phone).to eq(MfaContext.new(user).phone_configurations.first.phone)
-    expect(subject.international_code).to eq('US')
-    expect(subject.otp_delivery_preference).to eq(user.otp_delivery_preference)
-  end
-
-  it 'infers the international code from the user phone number' do
-    user = build_stubbed(:user, :with_phone, with: { phone: '+81 744 21 1234' })
-    subject = UserPhoneForm.new(user, MfaContext.new(user).phone_configurations.first)
-
-    expect(subject.international_code).to eq('JP')
-  end
-
   describe 'phone validation' do
     it do
       should validate_inclusion_of(:international_code).
@@ -72,7 +52,7 @@
 
       it 'does not update the user phone attribute' do
         user = create(:user)
-        subject = UserPhoneForm.new(user, MfaContext.new(user).phone_configurations.first)
+        subject = NewPhoneForm.new(user)
         params[:phone] = '+1 504 444 1643'
 
         subject.submit(params)
@@ -177,31 +157,4 @@
       expect(user.reload.remember_device_revoked_at).to be_within(1.second).of(Time.zone.now)
     end
   end
-
-  describe '#phone_config_changed?' do
-    it 'returns true if the user phone has changed' do
-      params[:phone] = '+1 504 444 1643'
-      subject.submit(params)
-
-      expect(subject.phone_config_changed?).to eq(true)
-    end
-
-    it 'returns false if the user phone has not changed' do
-      params[:phone] = MfaContext.new(user).phone_configurations.first.phone
-      subject.submit(params)
-
-      expect(subject.phone_config_changed?).to eq(false)
-    end
-
-    context 'when a user has no phone' do
-      it 'returns true' do
-        MfaContext.new(user).phone_configurations.clear
-
-        params[:phone] = '+1 504 444 1643'
-        subject.submit(params)
-
-        expect(subject.phone_config_changed?).to eq(true)
-      end
-    end
-  end
 end
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 3aa23abe078..1f83fa57cb5 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -98,7 +98,7 @@
     end
 
     it 'returns service_provider friendly_name if agency is missing' do
-      service_provider.friendly_name = "Only Friendly Name"
+      service_provider.friendly_name = 'Only Friendly Name'
       service_provider.agency = nil
       service_provider.save
       expect(identity_with_sp.display_name).to eq(service_provider.friendly_name)
@@ -117,7 +117,7 @@
     end
 
     it 'returns service_provider friendly_name if agency is missing' do
-      service_provider.friendly_name = "Only Friendly Name"
+      service_provider.friendly_name = 'Only Friendly Name'
       service_provider.agency = nil
       service_provider.save
       expect(identity_with_sp.agency_name).to eq(service_provider.friendly_name)
diff --git a/spec/services/otp_preference_updater_spec.rb b/spec/services/otp_preference_updater_spec.rb
index 93b4265930f..51269218b42 100644
--- a/spec/services/otp_preference_updater_spec.rb
+++ b/spec/services/otp_preference_updater_spec.rb
@@ -31,9 +31,9 @@
             preference: 'sms',
             phone_id: 1,
           )
-          attributes = { :otp_delivery_preference=>"sms",
-                         :otp_make_default_number=>nil,
-                         :phone_id=>1}
+          attributes = { otp_delivery_preference: 'sms',
+                         otp_make_default_number: nil,
+                         phone_id: 1 }
 
           updated_user = instance_double(UpdateUser)
           allow(UpdateUser).to receive(:new).
diff --git a/spec/support/features/session_helper.rb b/spec/support/features/session_helper.rb
index c45bd44def9..28345c3100f 100644
--- a/spec/support/features/session_helper.rb
+++ b/spec/support/features/session_helper.rb
@@ -26,13 +26,13 @@ def select_2fa_option(option)
     end
 
     def select_phone_delivery_option(delivery_option)
-      choose "user_phone_form_otp_delivery_preference_#{delivery_option}"
+      choose "new_phone_form_otp_delivery_preference_#{delivery_option}"
     end
 
     def sign_up_and_2fa_loa1_user
       user = sign_up_and_set_password
       select_2fa_option('phone')
-      fill_in 'user_phone_form_phone', with: '202-555-1212'
+      fill_in 'new_phone_form_phone', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
@@ -434,7 +434,7 @@ def submit_form_with_valid_password(password = VALID_PASSWORD)
 
     def set_up_2fa_with_valid_phone
       select_2fa_option('phone')
-      fill_in 'user_phone_form[phone]', with: '202-555-1212'
+      fill_in 'new_phone_form[phone]', with: '202-555-1212'
       click_send_security_code
       fill_in_code_with_last_phone_otp
       click_submit_default
diff --git a/spec/support/shared_examples/phone/rate_limitting.rb b/spec/support/shared_examples/phone/rate_limitting.rb
index 9606dc6be12..1b3e2b2bafd 100644
--- a/spec/support/shared_examples/phone/rate_limitting.rb
+++ b/spec/support/shared_examples/phone/rate_limitting.rb
@@ -21,7 +21,7 @@
     visit root_path
     sign_up_and_set_password
     select_2fa_option(:phone)
-    fill_in :user_phone_form_phone, with: phone
+    fill_in :new_phone_form_phone, with: phone
     click_send_security_code
 
     expect(page).to have_content(t('two_factor_authentication.max_otp_requests_reached'))
diff --git a/spec/views/phone_setup/index.html.slim_spec.rb b/spec/views/phone_setup/index.html.slim_spec.rb
index 4b15dbc8963..efdc79570e2 100644
--- a/spec/views/phone_setup/index.html.slim_spec.rb
+++ b/spec/views/phone_setup/index.html.slim_spec.rb
@@ -6,7 +6,7 @@
 
     allow(view).to receive(:current_user).and_return(user)
 
-    @user_phone_form = UserPhoneForm.new(user, nil)
+    @new_phone_form = NewPhoneForm.new(user)
     @presenter = SetupPresenter.new(user, false)
     render
   end
diff --git a/spec/views/users/phones/edit.html.slim_spec.rb b/spec/views/users/phones/edit.html.erb_spec.rb
similarity index 89%
rename from spec/views/users/phones/edit.html.slim_spec.rb
rename to spec/views/users/phones/edit.html.erb_spec.rb
index 26be594f232..b4dce964bb8 100644
--- a/spec/views/users/phones/edit.html.slim_spec.rb
+++ b/spec/views/users/phones/edit.html.erb_spec.rb
@@ -5,7 +5,7 @@
     before do
       user = build_stubbed(:user, :signed_up)
       allow(view).to receive(:current_user).and_return(user)
-      @user_phone_form = UserPhoneForm.new(user, MfaContext.new(user).phone_configurations.first)
+      @edit_phone_form = EditPhoneForm.new(user, MfaContext.new(user).phone_configurations.first)
     end
 
     it 'has a localized title' do