diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue
index eba5129a..85a85d52 100644
--- a/src/layouts/tpa-submit/tpa-submit.vue
+++ b/src/layouts/tpa-submit/tpa-submit.vue
@@ -282,7 +282,7 @@ export default {
             return {
                 glassShop: this.getPreferredShopTitle,
                 contactPhone: contactPhone,
-                contactEmail: this.mainStore.contactInfo.emailAddress
+                contactEmail: this.mainStore.contactInfo.emailAddress ?? ''
             }
         }
     },
diff --git a/src/store/index.js b/src/store/index.js
index 15b51802..9923c99a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1457,7 +1457,7 @@ export const useMainStore = defineStore({
                     emailAddress: contactInfo.emailAddress || customer.emailAddress,
                     firstName: contactInfo.firstName || customer.firstName,
                     lastName: contactInfo.lastName || customer.lastName,
-                    homePhone: contactInfo.extension ? contactInfo.servicePhone + contactInfo.extension : contactInfo.homePhone,
+                    homePhone: contactInfo.extension && contactInfo.homePhone ? contactInfo.homePhone + contactInfo.extension : contactInfo.homePhone,
                     servicePhone: contactInfo.servicePhone,
                     alternativePhone: contactInfo.alternativePhone,
                     isSmsOptIn: contactInfo.requestTextUpdates ?? false