diff --git a/src/helpers/global-rule-definer.js b/src/helpers/global-rule-definer.js
index f5a2335b..5aca4f66 100644
--- a/src/helpers/global-rule-definer.js
+++ b/src/helpers/global-rule-definer.js
@@ -86,7 +86,7 @@ function defineGlobalPhoneNumberRules() {
 function defineGlobalExtensionRules() {
     defineRule(
         globalRules.EXTENSION_FORMAT,
-        regex(/^[0-9]{5}$/, errorMessages.EXTENSION_FORMAT)
+        regex(/^[0-9]{1,5}$/, errorMessages.EXTENSION_FORMAT)
     );
 }
 
diff --git a/src/layouts/policy-holder-details/policy-holder-details.vue b/src/layouts/policy-holder-details/policy-holder-details.vue
index 95b8be47..23f938eb 100644
--- a/src/layouts/policy-holder-details/policy-holder-details.vue
+++ b/src/layouts/policy-holder-details/policy-holder-details.vue
@@ -55,6 +55,7 @@
                                 inputId="extensionField"
                                 cmsWidgetName="ExtensionQuestion"
                                 :validationRules="rules.extension"
+                                maxLength="5"
                                 disableAutoFill />
                         </div>
                     </div>
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 9c94782a..7d5b0572 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
@@ -49,6 +49,7 @@
                 inputId="extension"
                 :cmsWidgetName="widget.extensionQuestion"
                 disableAutoFill
+                maxLength="5"
                 :validationRules="rules.extension" />
         </template>
     </modal>
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 2a9293c1..4f0a38ee 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -39,6 +39,7 @@
                         inputId="extensionField"
                         cmsWidgetName="ExtensionQuestion"
                         :validationRules="rules.extension"
+                        maxLength="5"
                         disableAutoFill
                         class="form-group" />
                     <textboxQuestion
diff --git a/src/store/index.js b/src/store/index.js
index 3a9a37bd..daa02d03 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2293,7 +2293,8 @@ export const useMainStore = defineStore({
             this.order.serviceLocation.zipCode = welcomePageModel?.policyZipCode;
             this.updatePhoneNumbers({
                 home: welcomePageModel?.phoneNumber,
-                service: welcomePageModel?.phoneNumber
+                service: welcomePageModel?.phoneNumber,
+                extension: welcomePageModel?.extension
             });
         },
         updatePolicyHolderDetails(customerQuestions) {
@@ -2305,6 +2306,11 @@ export const useMainStore = defineStore({
             this.order.customer.firstName = customerQuestions.firstName;
             this.order.customer.lastName = customerQuestions.lastName;
             this.order.customer.emailAddress = customerQuestions.email;
+            this.updatePhoneNumbers({
+                home: customerQuestions.phoneNumber,
+                service: customerQuestions.phoneNumber,
+                extension: customerQuestions.extension
+            });
             this.order.serviceLocation.zipCode = customerQuestions.addressQuestions.zipCode;
         },
         updateIsSafeliteProvider(isSafelite) {