diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 1c35f96fa..3c2978744 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -149,10 +149,12 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
+            const vehiclePartsFromPageData = store.getters.pageData(
+                fmgPageValues.VEHICLE_PARTS
+            );
             return (
                 store.getters.damage.isRepair != null &&
-                store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
-                Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0
+                vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
             );
         },
         async forwardButtonAction() {
diff --git a/vue.config.js b/vue.config.js
index 64c83dd9e..e87582db2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
 process.env.VUE_APP_CONSUMER_CF_DISTRO =
   "https://digitalapi.dev.safelite.io";
 process.env.VUE_APP_HERITAGE_FUNNEL =
-  "http://localhost:38000/default.aspx";
+  "http://localhost/default.aspx";
 process.env.VUE_APP_GOOGLE_PLACES_API_KEY = 
   "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4MAoJo";
 process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost";