diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 998438f8..0f7eb8c3 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -327,8 +327,11 @@ function mapStringToState(str) {
  */
 export function mapStringToPhoneNumber(str) {
     // Expected token format: {phoneNumber:##########} (or 11 digits).
-     const regexExp = new RegExp(`\\{${dynamicStrings.PHONE_NUMBER}:([^{}]*?)\\}`, 'g');
-     return str.replace(regexExp, (_match, phoneNumber) => toDisplayPhoneNumber(phoneNumber));
+    const regexExp = new RegExp(`\\{${dynamicStrings.PHONE_NUMBER}:([^}]*)\\}`, 'g');
+     return str.replace(regexExp, (_match, rawValue) => {
+         const digits = (rawValue.match(/\d+/g) ?? []).join('');
+         return toDisplayPhoneNumber(digits);
+     });
 }
 
 /**
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 39b162bc..92ddeab2 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -232,7 +232,7 @@ export default {
 
         // Set order account number from the issConfig.
         mainStore.order.parentAccountNumber = mainStore.issConfig.parentAccountNumber;
-        mainStore.getCarrierAccountInfo().catch((error) => console.error(`Error in getCarrierAccountInfo ${error}`));
+        mainStore.getCarrierAccountInfo().catch((error) => console.error('Error in getCarrierAccountInfo', error));
 
         return { mainStore };
     },