diff --git a/app/controllers/openid_connect/logout_controller.rb b/app/controllers/openid_connect/logout_controller.rb
index 16f042142d2..ada39ed341e 100644
--- a/app/controllers/openid_connect/logout_controller.rb
+++ b/app/controllers/openid_connect/logout_controller.rb
@@ -133,9 +133,9 @@ def handle_successful_logout_request(result, redirect_uri)
     def handle_logout(result, redirect_uri)
       analytics.logout_initiated(**to_event(result))
 
-      sign_out
-
       redirect_user(redirect_uri, @logout_form.service_provider&.issuer, current_user&.uuid)
+
+      sign_out
     end
 
     # Convert FormResponse into loggable analytics event
diff --git a/app/controllers/users/delete_controller.rb b/app/controllers/users/delete_controller.rb
index a58e6cbb72f..c76d65b904a 100644
--- a/app/controllers/users/delete_controller.rb
+++ b/app/controllers/users/delete_controller.rb
@@ -16,10 +16,10 @@ def delete
       send_push_notifications
       notify_user_via_email_of_deletion
       notify_user_via_sms_of_deletion
+      analytics.account_delete_submitted(success: true)
       delete_user
       sign_out
       flash[:success] = t('devise.registrations.destroyed')
-      analytics.account_delete_submitted(success: true)
       redirect_to root_url
     end
 
diff --git a/spec/controllers/users/delete_controller_spec.rb b/spec/controllers/users/delete_controller_spec.rb
index c5c4d113907..e5afa1f93d9 100644
--- a/spec/controllers/users/delete_controller_spec.rb
+++ b/spec/controllers/users/delete_controller_spec.rb
@@ -44,13 +44,12 @@
       end
 
       it 'logs a failed submit' do
-        stub_analytics
-        stub_signed_in_user
-
-        expect(@analytics).to receive(:track_event).
-          with('Account Delete submitted', success: false)
+        user = stub_signed_in_user
+        stub_analytics(user:)
 
         delete
+
+        expect(@analytics).to have_logged_event('Account Delete submitted', success: false)
       end
     end
 
@@ -82,13 +81,12 @@
     end
 
     it 'logs a succesful submit' do
-      stub_analytics
-      stub_signed_in_user
-
-      expect(@analytics).to receive(:track_event).
-        with('Account Delete submitted', success: true)
+      user = stub_signed_in_user
+      stub_analytics(user:)
 
       delete
+
+      expect(@analytics).to have_logged_event('Account Delete submitted', success: true)
     end
 
     it 'does not delete identities to prevent uuid reuse' do
diff --git a/spec/controllers/users/piv_cac_login_controller_spec.rb b/spec/controllers/users/piv_cac_login_controller_spec.rb
index 75c99da9d05..3853a61b023 100644
--- a/spec/controllers/users/piv_cac_login_controller_spec.rb
+++ b/spec/controllers/users/piv_cac_login_controller_spec.rb
@@ -2,8 +2,10 @@
 
 RSpec.describe Users::PivCacLoginController do
   describe 'GET new' do
+    let(:user) {}
+
     before do
-      stub_analytics
+      stub_analytics(user:)
     end
 
     context 'without a token' do
@@ -47,7 +49,6 @@
       end
 
       context 'with a valid token' do
-        let(:user) {}
         let(:service_provider) { create(:service_provider) }
         let(:sp_session) { { ial: 1, issuer: service_provider.issuer, vtr: vtr } }
         let(:nonce) { SecureRandom.base64(20) }
@@ -68,7 +69,6 @@
           controller.session[:sp] = sp_session
 
           allow(PivCacService).to receive(:decode_token).with(token) { data }
-          stub_analytics(user:)
         end
 
         context 'without a valid user' do
diff --git a/spec/support/analytics_helper.rb b/spec/support/analytics_helper.rb
index 0f7e125a0c3..1c2ae7fe23a 100644
--- a/spec/support/analytics_helper.rb
+++ b/spec/support/analytics_helper.rb
@@ -3,8 +3,8 @@ def stub_analytics(user: nil)
     analytics = FakeAnalytics.new
 
     if user
-      allow(controller).to receive(:analytics) do
-        expect(controller.analytics_user).to eq(user)
+      allow(controller).to receive(:analytics).and_wrap_original do |original|
+        expect(original.call.user).to eq(user)
         analytics
       end
     else
diff --git a/spec/support/controller_helper.rb b/spec/support/controller_helper.rb
index d8c33b1c171..7e8b1f15d10 100644
--- a/spec/support/controller_helper.rb
+++ b/spec/support/controller_helper.rb
@@ -19,6 +19,9 @@ def stub_sign_in(user = build(:user, password: VALID_PASSWORD))
     allow(controller).to receive(:user_session).and_return({}.with_indifferent_access)
     controller.auth_methods_session.authenticate!(TwoFactorAuthenticatable::AuthMethod::SMS)
     allow(controller).to receive(:current_user).and_return(user)
+    allow(controller).to receive(:sign_out) do
+      allow(controller).to receive(:current_user).and_return(nil)
+    end
     allow(controller).to receive(:confirm_two_factor_authenticated).and_return(true)
     allow(controller).to receive(:user_fully_authenticated?).and_return(true)
     allow(controller).to receive(:remember_device_expired_for_sp?).and_return(false)