diff --git a/app/controllers/concerns/idv/step_utilities_concern.rb b/app/controllers/concerns/idv/step_utilities_concern.rb
index 59e03150f23..cd065b15560 100644
--- a/app/controllers/concerns/idv/step_utilities_concern.rb
+++ b/app/controllers/concerns/idv/step_utilities_concern.rb
@@ -2,15 +2,6 @@ module Idv
   module StepUtilitiesConcern
     extend ActiveSupport::Concern
 
-    def flow_session
-      user_session['idv/doc_auth']
-    end
-
-    # copied from doc_auth_controller
-    def flow_path
-      flow_session[:flow_path]
-    end
-
     # Copied from capture_doc_flow.rb
     # and from doc_auth_flow.rb
     def acuant_sdk_ab_test_analytics_args
diff --git a/app/controllers/concerns/idv_step_concern.rb b/app/controllers/concerns/idv_step_concern.rb
index 9f10dfdf291..fd12ca56b90 100644
--- a/app/controllers/concerns/idv_step_concern.rb
+++ b/app/controllers/concerns/idv_step_concern.rb
@@ -8,11 +8,21 @@ module IdvStepConcern
     before_action :confirm_idv_needed
   end
 
-  def confirm_document_capture_complete
-    @pii = flow_session&.[]('pii_from_doc') # hash with indifferent access
-    return if @pii.present?
+  def flow_session
+    user_session['idv/doc_auth']
+  end
+
+  def pii_from_doc
+    flow_session&.[]('pii_from_doc')
+  end
 
-    flow_path = flow_session&.[](:flow_path)
+  # copied from doc_auth_controller
+  def flow_path
+    flow_session&.[](:flow_path)
+  end
+
+  def confirm_document_capture_complete
+    return if pii_from_doc.present?
 
     if IdentityConfig.store.doc_auth_document_capture_controller_enabled &&
        flow_path == 'standard'
diff --git a/app/controllers/idv/address_controller.rb b/app/controllers/idv/address_controller.rb
index 9c07d69ed6c..29acabfd2ca 100644
--- a/app/controllers/idv/address_controller.rb
+++ b/app/controllers/idv/address_controller.rb
@@ -1,14 +1,14 @@
 module Idv
   class AddressController < ApplicationController
     include IdvSession
+    include IdvStepConcern
 
-    before_action :confirm_two_factor_authenticated
     before_action :confirm_document_capture_complete
 
     def new
       analytics.idv_address_visit
 
-      @presenter = AddressPresenter.new(pii: @pii)
+      @presenter = AddressPresenter.new(pii: pii_from_doc)
     end
 
     def update
@@ -24,22 +24,8 @@ def update
 
     private
 
-    def confirm_document_capture_complete
-      @pii = user_session.dig('idv/doc_auth', 'pii_from_doc')
-      return if @pii.present?
-
-      flow_path = user_session.dig('idv/doc_auth', :flow_path)
-
-      if IdentityConfig.store.doc_auth_document_capture_controller_enabled &&
-         flow_path == 'standard'
-        redirect_to idv_document_capture_url
-      else
-        redirect_to idv_doc_auth_url
-      end
-    end
-
     def idv_form
-      Idv::AddressForm.new(@pii)
+      Idv::AddressForm.new(pii_from_doc)
     end
 
     def success
diff --git a/app/controllers/idv/document_capture_controller.rb b/app/controllers/idv/document_capture_controller.rb
index 36aa13bfd55..93c9f45a4c9 100644
--- a/app/controllers/idv/document_capture_controller.rb
+++ b/app/controllers/idv/document_capture_controller.rb
@@ -1,6 +1,7 @@
 module Idv
   class DocumentCaptureController < ApplicationController
     include IdvSession
+    include IdvStepConcern
     include StepIndicatorConcern
     include StepUtilitiesConcern
     include DocumentCaptureConcern
diff --git a/app/controllers/idv/ssn_controller.rb b/app/controllers/idv/ssn_controller.rb
index 25945d0373f..936b331d6f3 100644
--- a/app/controllers/idv/ssn_controller.rb
+++ b/app/controllers/idv/ssn_controller.rb
@@ -56,7 +56,7 @@ def extra_view_variables
     private
 
     def next_url
-      if @pii[:state] == 'PR'
+      if pii_from_doc[:state] == 'PR'
         idv_address_url
       else
         idv_verify_info_url