diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue
index 831317e8..fa6f17c3 100644
--- a/src/layouts/coverage-statement/coverage-statement.vue
+++ b/src/layouts/coverage-statement/coverage-statement.vue
@@ -385,17 +385,10 @@ export default {
                         {},
                         { [routerParams.SAVE_SESSION_SYNCHRONOUS]: true }
                     );
-                } else if (useMainStore().issConfig.enableTPAFlow) {
-                    this.$router.navigate(
-                        navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED,
-                        this.$route,
-                        {},
-                        { [routerParams.SAVE_SESSION_SYNCHRONOUS]: true }
-                    );
                 } else {
-                    this.mainStore.setBailout(this.$router.currentRoute, bailoutMessage.TPANotEnabled());
+                    this.mainStore.setBailout(this.$router.currentRoute, bailoutMessage.RequestCallback());
                     this.$router.navigate(
-                        navigationScenarios.CLICKED_FORWARD_WITH_TPA_DISABLED,
+                        navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP,
                         this.$route,
                         {},
                         { [routerParams.SAVE_SESSION_SYNCHRONOUS]: true }
diff --git a/src/layouts/tpa-submit/contact-details-drawer/contact-details-drawer.vue b/src/layouts/tpa-submit/contact-details-drawer/contact-details-drawer.vue
index db4e13cb..b66f4c8a 100644
--- a/src/layouts/tpa-submit/contact-details-drawer/contact-details-drawer.vue
+++ b/src/layouts/tpa-submit/contact-details-drawer/contact-details-drawer.vue
@@ -38,6 +38,8 @@
                 inputId="phoneNumber"
                 :cmsWidgetName="widget.phoneNumberQuestion"
                 isRequired
+                mask="###-###-####"
+                disableAutoFill
                 :validationRules="rules.phoneNumber" />
         </template>
     </modal>
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 03860dee..0badb2e7 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -509,11 +509,7 @@ const routingTable = () => [
                 destinationIssPageValue: issPageValues.SERVICE_LOCATION
             },
             {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_ENABLED,
-                destinationIssPageValue: issPageValues.TPA_SEARCH
-            },
-            {
-                scenario: navigationScenarios.CLICKED_FORWARD_WITH_TPA_DISABLED,
+                scenario: navigationScenarios.CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP,
                 destinationIssPageValue: issPageValues.BAILOUT_PAGE
             },
             {