diff --git a/src/iss-components/site-footer/site-footer.vue b/src/iss-components/site-footer/site-footer.vue
index 8188dd76..bfae52a3 100644
--- a/src/iss-components/site-footer/site-footer.vue
+++ b/src/iss-components/site-footer/site-footer.vue
@@ -61,6 +61,7 @@ export default {
         isForwardActionDisabled: Boolean,
         isBackButtonHidden: { type: Boolean, default: false },
         isForwardButtonHidden: { type: Boolean, default: false },
+        isForwardButtonNavigavtionDisabled: { type: Boolean, default: false },
         cmsWidgetName: String,
         isStackedVertically: { type: Boolean, default: false }
     },
@@ -99,7 +100,7 @@ export default {
             // prevent keyboard input after button click
             document.onkeydown = () => false;
 
-            if ((!this.disableForwardAction && !this.isForwardActionDisabled)) {
+            if ((!this.disableForwardAction && !this.isForwardActionDisabled && !this.isForwardButtonNavigavtionDisabled)) {
                 showIssLoadingModal(true);
             }
             this.$emit('forwardClicked');
diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue
index e3647c47..1b63e7b7 100644
--- a/src/layouts/provider-preference/provider-preference.vue
+++ b/src/layouts/provider-preference/provider-preference.vue
@@ -30,6 +30,7 @@
                         class="mt-5"
                         cmsWidgetName="SiteFooterWidget"
                         :isForwardActionDisabled="isForwardActionDisabled"
+                        :isForwardButtonNavigavtionDisabled="isForwardNavigationDisabled"
                         @backClicked="navigateBack"
                         @forwardClicked="forwardButtonAction" />
                 </div>
@@ -78,6 +79,7 @@ import tpaRecalModal from '@/layouts/provider-preference/tpa-recal-modal/tpa-rec
 import globalRules from '@/constants/global-rules';
 import bailoutMessage from '@/constants/bailoutMessage';
 import contentGroupModal from '@/iss-components/content-group-modal/content-group-modal.vue';
+import showIssLoadingModal from '@/helpers/loading-modal-helper';
 
 const options = { SAFELITE: 'SafeliteOption', TPA: 'TPAOption' };
 const RECAL_MODAL_REF_NAME = 'RecalModal';
@@ -139,6 +141,9 @@ export default {
         isForwardActionDisabled() {
             return this.selectedProvider === null;
         },
+        isForwardNavigationDisabled() {
+            return this.selectedProvider === options.TPA && !this.tpaAcknowledgement;
+        },
         prefAnswers() {
             const cmsAnswersContent = [
                 {
@@ -215,6 +220,7 @@ export default {
                 selectedProvider: this.selectedProvider,
                 tpaAcknowledgement: this.tpaAcknowledgement
             });
+            showIssLoadingModal(true);
             this.navigateForward(this.navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED);
         },
         forwardButtonAction() {
@@ -222,7 +228,6 @@ export default {
                 let scenario = null;
                 switch (this.selectedProvider) {
                     case options.SAFELITE:
-                        this.mainStore.updateIsSafeliteProvider(true);
                         scenario =
                             this.navigationScenarios
                                 .CLICKED_FORWARD_WITH_SAFELITE;
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 8aee9a35..313ca9e4 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -109,7 +109,7 @@
                         :validationRules="rules.email"
                         isRequired
                         disableAutoFill
-                        class="mt-3" />                                       
+                        class="mt-3" />
                     <buttonQuestion
                         v-if="displayGlassOnlyQuestion"
                         ref="glassOnlyDamage"
@@ -514,7 +514,7 @@ form {
 // Remove underline from help text links
 :deep(.text-block a) {
     text-decoration: none;
-    
+
     &:hover {
         text-decoration: underline;
     }