diff --git a/package-lock.json b/package-lock.json
index b226fb566..39a656c44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,20 @@
 {
   "name": "business-create-ui",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.4.0",
+      "version": "5.4.1",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
+        "@bcrs-shared-components/base-address": "2.0.3",
         "@bcrs-shared-components/breadcrumb": "2.1.15",
         "@bcrs-shared-components/business-lookup": "1.1.30",
         "@bcrs-shared-components/certify": "2.1.15",
-        "@bcrs-shared-components/completing-party": "2.1.28",
+        "@bcrs-shared-components/completing-party": "2.1.30",
         "@bcrs-shared-components/confirm-dialog": "1.2.1",
         "@bcrs-shared-components/contact-info": "1.2.15",
         "@bcrs-shared-components/corp-type-module": "1.0.11",
@@ -25,9 +26,9 @@
         "@bcrs-shared-components/enums": "1.0.46",
         "@bcrs-shared-components/genesys-web-message": "1.0.0",
         "@bcrs-shared-components/help-business-number": "1.1.1",
-        "@bcrs-shared-components/interfaces": "1.0.70",
+        "@bcrs-shared-components/interfaces": "1.0.71",
         "@bcrs-shared-components/limited-restoration-panel": "1.0.5",
-        "@bcrs-shared-components/mixins": "1.1.20",
+        "@bcrs-shared-components/mixins": "1.1.21",
         "@bcrs-shared-components/nature-of-business": "1.2.14",
         "@bcrs-shared-components/relationships-panel": "1.0.9",
         "@bcrs-shared-components/staff-comments": "1.3.15",
@@ -87,9 +88,9 @@
         "vite-plugin-environment": "^1.1.3",
         "vitest": "0.33.0",
         "vue-class-component": "7.2.6",
-        "vue-plugin-helper-decorator": "^0.0.12",
         "vue-property-decorator": "^9.1.2",
         "vue-test-utils-helpers": "git+https://github.com/bcgov/vue-test-utils-helpers.git",
+        "vuelidate-property-decorators": "1.0.28",
         "vuetify-loader": "^1.9.2",
         "vuex-class": "^0.3.2",
         "vuex-module-decorators": "^1.2.0"
@@ -180,23 +181,14 @@
       }
     },
     "node_modules/@bcrs-shared-components/base-address": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.1.tgz",
-      "integrity": "sha512-7H8g+F5H1fUDO1DBk2WMXUlWwkvSA6xgl2FZNLDuk9n6kIXE2G15o8hOLRRpGIhC8sNiAR2PPEWVhU3uixqudg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.3.tgz",
+      "integrity": "sha512-7jmKZmyv6lmsqSw+cx1b3BjADvaZaxRTGogitvVBMpdYJV7p4gXKeN6TOiZFqz8/11ynclsCAvmLxDLeuEfrzw==",
       "dependencies": {
-        "@bcrs-shared-components/mixins": "^1.1.20",
+        "@bcrs-shared-components/mixins": "^1.1.21",
         "lodash.uniqueid": "^4.0.1",
         "vue": "^2.7.14",
-        "vuelidate": "^0.7.4"
-      }
-    },
-    "node_modules/@bcrs-shared-components/base-address/node_modules/vuelidate": {
-      "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
-      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
-      "engines": {
-        "node": ">= 4.0.0",
-        "npm": ">= 3.0.0"
+        "vuelidate": "0.6.2"
       }
     },
     "node_modules/@bcrs-shared-components/breadcrumb": {
@@ -218,15 +210,6 @@
         "vue": "^2.7.14"
       }
     },
-    "node_modules/@bcrs-shared-components/business-lookup/node_modules/@bcrs-shared-components/interfaces": {
-      "version": "1.0.71",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.71.tgz",
-      "integrity": "sha512-0cKLeAoiXQS//6zBZZmtTrxyExML6Jy28qP1RrlHAertmCmqNXNpmSqb49rj0x4tUki/nwc0HoKGV1qkzCayAg==",
-      "dependencies": {
-        "@bcrs-shared-components/enums": "^1.0.46",
-        "vue": "^2.7.14"
-      }
-    },
     "node_modules/@bcrs-shared-components/certify": {
       "version": "2.1.15",
       "resolved": "https://registry.npmjs.org/@bcrs-shared-components/certify/-/certify-2.1.15.tgz",
@@ -237,24 +220,15 @@
       }
     },
     "node_modules/@bcrs-shared-components/completing-party": {
-      "version": "2.1.28",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.28.tgz",
-      "integrity": "sha512-/vidduRpTntLgipieeQ9XrKre4FaeNAle/OR1PAZNSM9BPij8V5tvQ66JnpR8ozya8dUDuwi+RDoahpB8aQpag==",
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.30.tgz",
+      "integrity": "sha512-+v8rdIsZ7tIk6el2aO6tNyI8OieShvUOOr0m57HdVdLLVyxw4KZcvbKV+kYuqak9+W7i8EP8G6PkqWlMzRlOuw==",
       "dependencies": {
-        "@bcrs-shared-components/base-address": "^2.0.1",
-        "@bcrs-shared-components/interfaces": "^1.0.70",
+        "@bcrs-shared-components/base-address": "^2.0.3",
+        "@bcrs-shared-components/interfaces": "^1.0.71",
         "lodash": "4.17.21",
         "vue": "^2.7.14",
-        "vuelidate": "^0.7.7"
-      }
-    },
-    "node_modules/@bcrs-shared-components/completing-party/node_modules/vuelidate": {
-      "version": "0.7.7",
-      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
-      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
-      "engines": {
-        "node": ">= 4.0.0",
-        "npm": ">= 3.0.0"
+        "vuelidate": "0.6.2"
       }
     },
     "node_modules/@bcrs-shared-components/confirm-dialog": {
@@ -382,9 +356,9 @@
       }
     },
     "node_modules/@bcrs-shared-components/interfaces": {
-      "version": "1.0.70",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.70.tgz",
-      "integrity": "sha512-wCdUaDlwT5Ibgk9DaSm6fFcIOUna0IWMRV5CuW5ltveYfXq9uXTlr9OwR+cH/rta014O4qxhE6G8z/wAWokGhw==",
+      "version": "1.0.71",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.71.tgz",
+      "integrity": "sha512-0cKLeAoiXQS//6zBZZmtTrxyExML6Jy28qP1RrlHAertmCmqNXNpmSqb49rj0x4tUki/nwc0HoKGV1qkzCayAg==",
       "dependencies": {
         "@bcrs-shared-components/enums": "^1.0.46",
         "vue": "^2.7.14"
@@ -399,12 +373,12 @@
       }
     },
     "node_modules/@bcrs-shared-components/mixins": {
-      "version": "1.1.20",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.20.tgz",
-      "integrity": "sha512-nWsLkfkwtWUd3EzHjAw9z/UgzvRNz6nFS1Q1+oZ5FjZ/Q6f3Cu3PJ0pX67v+aVM15zESUpCrKr6s0khdgA0Oww==",
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.21.tgz",
+      "integrity": "sha512-5FJxo7GGCuNH/VDv58Jtjd/2x0x4RT21r1Ay3JwAslAASiEWBaeWy/nPNatxReDV3BUIu+XXc/1Ek/mXwqoCag==",
       "dependencies": {
         "@bcrs-shared-components/enums": "^1.0.46",
-        "@bcrs-shared-components/interfaces": "^1.0.70",
+        "@bcrs-shared-components/interfaces": "^1.0.71",
         "country-list": "^2.3.0",
         "lodash": "4.17.21",
         "provinces": "^1.11.0",
@@ -1085,9 +1059,9 @@
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "peer": true,
       "engines": {
@@ -1122,23 +1096,16 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true,
-      "peer": true
-    },
     "node_modules/@mapbox/node-pre-gyp": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
@@ -1432,9 +1399,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.44.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
-      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
+      "version": "8.44.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
+      "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -2693,9 +2660,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001518",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz",
-      "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
+      "version": "1.0.30001519",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
+      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==",
       "dev": true,
       "funding": [
         {
@@ -3149,9 +3116,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.481",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.481.tgz",
-      "integrity": "sha512-25DitMKGaWUPjv3kCt2H3UqgMhmdN+ufG+PoSjnQtheR64Dvo75RbojLPzUmnwrEuLEzR5YrbTzOUq9DtnTUUw==",
+      "version": "1.4.488",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.488.tgz",
+      "integrity": "sha512-Dv4sTjiW7t/UWGL+H8ZkgIjtUAVZDgb/PwGWvMsCT7jipzUV/u5skbLXPFKb6iV0tiddVi/bcS2/kUrczeWgIQ==",
       "dev": true,
       "peer": true
     },
@@ -8189,21 +8156,6 @@
       "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-1.0.0.tgz",
       "integrity": "sha512-s5TFh3s3h3Mhd3jaz3zGzkVHKHnc/0C/gNr30olO99+yw2hl3WBhK3ng3/f9OF+qkW4+l7GkmwfAzDAcY3lCFg=="
     },
-    "node_modules/vue-plugin-helper-decorator": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/vue-plugin-helper-decorator/-/vue-plugin-helper-decorator-0.0.12.tgz",
-      "integrity": "sha512-ITZK+YV2b+a8stGW4th5jXciQof2TJ/fhukF0X6b6KGV97vhe92iyyHf4V2xNVoVJTBtf8GZfIeaAaNjuYqy8g==",
-      "dev": true,
-      "dependencies": {
-        "vue-class-component": "^6.2.0"
-      }
-    },
-    "node_modules/vue-plugin-helper-decorator/node_modules/vue-class-component": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
-      "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
-      "dev": true
-    },
     "node_modules/vue-property-decorator": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
@@ -8257,6 +8209,26 @@
         "npm": ">= 3.0.0"
       }
     },
+    "node_modules/vuelidate-property-decorators": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/vuelidate-property-decorators/-/vuelidate-property-decorators-1.0.28.tgz",
+      "integrity": "sha512-ktb+9bYkTSmUFLi9g7gMGY035F5WvNnBQ/yl1U8MlclcFT65bYU/vBQ5HcZ4T1Ko6IL5wIPD4XJ+KkllKvgycg==",
+      "dev": true,
+      "dependencies": {
+        "vue-class-component": "^7.0.1",
+        "vuelidate": "^0.7.4"
+      }
+    },
+    "node_modules/vuelidate-property-decorators/node_modules/vuelidate": {
+      "version": "0.7.7",
+      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
+      "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/vuetify": {
       "version": "2.6.15",
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.15.tgz",
@@ -8615,21 +8587,14 @@
       }
     },
     "@bcrs-shared-components/base-address": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.1.tgz",
-      "integrity": "sha512-7H8g+F5H1fUDO1DBk2WMXUlWwkvSA6xgl2FZNLDuk9n6kIXE2G15o8hOLRRpGIhC8sNiAR2PPEWVhU3uixqudg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/base-address/-/base-address-2.0.3.tgz",
+      "integrity": "sha512-7jmKZmyv6lmsqSw+cx1b3BjADvaZaxRTGogitvVBMpdYJV7p4gXKeN6TOiZFqz8/11ynclsCAvmLxDLeuEfrzw==",
       "requires": {
-        "@bcrs-shared-components/mixins": "^1.1.20",
+        "@bcrs-shared-components/mixins": "^1.1.21",
         "lodash.uniqueid": "^4.0.1",
         "vue": "^2.7.14",
-        "vuelidate": "^0.7.4"
-      },
-      "dependencies": {
-        "vuelidate": {
-          "version": "0.7.7",
-          "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
-          "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA=="
-        }
+        "vuelidate": "0.6.2"
       }
     },
     "@bcrs-shared-components/breadcrumb": {
@@ -8649,17 +8614,6 @@
         "@bcrs-shared-components/interfaces": "^1.0.71",
         "lodash": "4.17.21",
         "vue": "^2.7.14"
-      },
-      "dependencies": {
-        "@bcrs-shared-components/interfaces": {
-          "version": "1.0.71",
-          "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.71.tgz",
-          "integrity": "sha512-0cKLeAoiXQS//6zBZZmtTrxyExML6Jy28qP1RrlHAertmCmqNXNpmSqb49rj0x4tUki/nwc0HoKGV1qkzCayAg==",
-          "requires": {
-            "@bcrs-shared-components/enums": "^1.0.46",
-            "vue": "^2.7.14"
-          }
-        }
       }
     },
     "@bcrs-shared-components/certify": {
@@ -8672,22 +8626,15 @@
       }
     },
     "@bcrs-shared-components/completing-party": {
-      "version": "2.1.28",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.28.tgz",
-      "integrity": "sha512-/vidduRpTntLgipieeQ9XrKre4FaeNAle/OR1PAZNSM9BPij8V5tvQ66JnpR8ozya8dUDuwi+RDoahpB8aQpag==",
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/completing-party/-/completing-party-2.1.30.tgz",
+      "integrity": "sha512-+v8rdIsZ7tIk6el2aO6tNyI8OieShvUOOr0m57HdVdLLVyxw4KZcvbKV+kYuqak9+W7i8EP8G6PkqWlMzRlOuw==",
       "requires": {
-        "@bcrs-shared-components/base-address": "^2.0.1",
-        "@bcrs-shared-components/interfaces": "^1.0.70",
+        "@bcrs-shared-components/base-address": "^2.0.3",
+        "@bcrs-shared-components/interfaces": "^1.0.71",
         "lodash": "4.17.21",
         "vue": "^2.7.14",
-        "vuelidate": "^0.7.7"
-      },
-      "dependencies": {
-        "vuelidate": {
-          "version": "0.7.7",
-          "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
-          "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA=="
-        }
+        "vuelidate": "0.6.2"
       }
     },
     "@bcrs-shared-components/confirm-dialog": {
@@ -8819,9 +8766,9 @@
       }
     },
     "@bcrs-shared-components/interfaces": {
-      "version": "1.0.70",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.70.tgz",
-      "integrity": "sha512-wCdUaDlwT5Ibgk9DaSm6fFcIOUna0IWMRV5CuW5ltveYfXq9uXTlr9OwR+cH/rta014O4qxhE6G8z/wAWokGhw==",
+      "version": "1.0.71",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.71.tgz",
+      "integrity": "sha512-0cKLeAoiXQS//6zBZZmtTrxyExML6Jy28qP1RrlHAertmCmqNXNpmSqb49rj0x4tUki/nwc0HoKGV1qkzCayAg==",
       "requires": {
         "@bcrs-shared-components/enums": "^1.0.46",
         "vue": "^2.7.14"
@@ -8836,12 +8783,12 @@
       }
     },
     "@bcrs-shared-components/mixins": {
-      "version": "1.1.20",
-      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.20.tgz",
-      "integrity": "sha512-nWsLkfkwtWUd3EzHjAw9z/UgzvRNz6nFS1Q1+oZ5FjZ/Q6f3Cu3PJ0pX67v+aVM15zESUpCrKr6s0khdgA0Oww==",
+      "version": "1.1.21",
+      "resolved": "https://registry.npmjs.org/@bcrs-shared-components/mixins/-/mixins-1.1.21.tgz",
+      "integrity": "sha512-5FJxo7GGCuNH/VDv58Jtjd/2x0x4RT21r1Ay3JwAslAASiEWBaeWy/nPNatxReDV3BUIu+XXc/1Ek/mXwqoCag==",
       "requires": {
         "@bcrs-shared-components/enums": "^1.0.46",
-        "@bcrs-shared-components/interfaces": "^1.0.70",
+        "@bcrs-shared-components/interfaces": "^1.0.71",
         "country-list": "^2.3.0",
         "lodash": "4.17.21",
         "provinces": "^1.11.0",
@@ -9246,9 +9193,9 @@
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
       "peer": true
     },
@@ -9277,23 +9224,14 @@
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.18",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
-      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
       "peer": true,
       "requires": {
-        "@jridgewell/resolve-uri": "3.1.0",
-        "@jridgewell/sourcemap-codec": "1.4.14"
-      },
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": {
-          "version": "1.4.14",
-          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-          "dev": true,
-          "peer": true
-        }
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
     "@mapbox/node-pre-gyp": {
@@ -9538,9 +9476,9 @@
       }
     },
     "@types/eslint": {
-      "version": "8.44.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.1.tgz",
-      "integrity": "sha512-XpNDc4Z5Tb4x+SW1MriMVeIsMoONHCkWFMkR/aPJbzEsxqHy+4Glu/BqTdPrApfDeMaXbtNh6bseNgl5KaWrSg==",
+      "version": "8.44.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
+      "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -10492,9 +10430,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001518",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz",
-      "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==",
+      "version": "1.0.30001519",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
+      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==",
       "dev": true,
       "peer": true
     },
@@ -10839,9 +10777,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.481",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.481.tgz",
-      "integrity": "sha512-25DitMKGaWUPjv3kCt2H3UqgMhmdN+ufG+PoSjnQtheR64Dvo75RbojLPzUmnwrEuLEzR5YrbTzOUq9DtnTUUw==",
+      "version": "1.4.488",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.488.tgz",
+      "integrity": "sha512-Dv4sTjiW7t/UWGL+H8ZkgIjtUAVZDgb/PwGWvMsCT7jipzUV/u5skbLXPFKb6iV0tiddVi/bcS2/kUrczeWgIQ==",
       "dev": true,
       "peer": true
     },
@@ -14497,23 +14435,6 @@
       "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-1.0.0.tgz",
       "integrity": "sha512-s5TFh3s3h3Mhd3jaz3zGzkVHKHnc/0C/gNr30olO99+yw2hl3WBhK3ng3/f9OF+qkW4+l7GkmwfAzDAcY3lCFg=="
     },
-    "vue-plugin-helper-decorator": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/vue-plugin-helper-decorator/-/vue-plugin-helper-decorator-0.0.12.tgz",
-      "integrity": "sha512-ITZK+YV2b+a8stGW4th5jXciQof2TJ/fhukF0X6b6KGV97vhe92iyyHf4V2xNVoVJTBtf8GZfIeaAaNjuYqy8g==",
-      "dev": true,
-      "requires": {
-        "vue-class-component": "^6.2.0"
-      },
-      "dependencies": {
-        "vue-class-component": {
-          "version": "6.3.2",
-          "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
-          "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A==",
-          "dev": true
-        }
-      }
-    },
     "vue-property-decorator": {
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz",
@@ -14559,6 +14480,24 @@
       "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.6.2.tgz",
       "integrity": "sha512-rowo/OSwC8XEGdWg+ZgTpcgxYtmbQKbGOw4Z+lfT/BkNPoNyPEVgIeObUhhFO7Q7Lz0u0p429qfus/BHs9tMpg=="
     },
+    "vuelidate-property-decorators": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/vuelidate-property-decorators/-/vuelidate-property-decorators-1.0.28.tgz",
+      "integrity": "sha512-ktb+9bYkTSmUFLi9g7gMGY035F5WvNnBQ/yl1U8MlclcFT65bYU/vBQ5HcZ4T1Ko6IL5wIPD4XJ+KkllKvgycg==",
+      "dev": true,
+      "requires": {
+        "vue-class-component": "^7.0.1",
+        "vuelidate": "^0.7.4"
+      },
+      "dependencies": {
+        "vuelidate": {
+          "version": "0.7.7",
+          "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.7.tgz",
+          "integrity": "sha512-pT/U2lDI67wkIqI4tum7cMSIfGcAMfB+Phtqh2ttdXURwvHRBJEAQ0tVbUsW9Upg83Q5QH59bnCoXI7A9JDGnA==",
+          "dev": true
+        }
+      }
+    },
     "vuetify": {
       "version": "2.6.15",
       "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.15.tgz",
diff --git a/package.json b/package.json
index 36d65d0ec..1ef9a9515 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
@@ -15,10 +15,11 @@
   "dependencies": {
     "@babel/compat-data": "^7.21.5",
     "@bcrs-shared-components/approval-type": "1.0.19",
+    "@bcrs-shared-components/base-address": "2.0.3",
     "@bcrs-shared-components/breadcrumb": "2.1.15",
     "@bcrs-shared-components/business-lookup": "1.1.30",
     "@bcrs-shared-components/certify": "2.1.15",
-    "@bcrs-shared-components/completing-party": "2.1.28",
+    "@bcrs-shared-components/completing-party": "2.1.30",
     "@bcrs-shared-components/confirm-dialog": "1.2.1",
     "@bcrs-shared-components/contact-info": "1.2.15",
     "@bcrs-shared-components/corp-type-module": "1.0.11",
@@ -30,9 +31,9 @@
     "@bcrs-shared-components/enums": "1.0.46",
     "@bcrs-shared-components/genesys-web-message": "1.0.0",
     "@bcrs-shared-components/help-business-number": "1.1.1",
-    "@bcrs-shared-components/interfaces": "1.0.70",
+    "@bcrs-shared-components/interfaces": "1.0.71",
     "@bcrs-shared-components/limited-restoration-panel": "1.0.5",
-    "@bcrs-shared-components/mixins": "1.1.20",
+    "@bcrs-shared-components/mixins": "1.1.21",
     "@bcrs-shared-components/nature-of-business": "1.2.14",
     "@bcrs-shared-components/relationships-panel": "1.0.9",
     "@bcrs-shared-components/staff-comments": "1.3.15",
@@ -92,7 +93,7 @@
     "vite-plugin-environment": "^1.1.3",
     "vitest": "0.33.0",
     "vue-class-component": "7.2.6",
-    "vue-plugin-helper-decorator": "^0.0.12",
+    "vuelidate-property-decorators": "1.0.28",
     "vue-property-decorator": "^9.1.2",
     "vue-test-utils-helpers": "git+https://github.com/bcgov/vue-test-utils-helpers.git",
     "vuetify-loader": "^1.9.2",
diff --git a/src/components/Dissolution/AssociationDetails.vue b/src/components/Dissolution/AssociationDetails.vue
index b8416fe3f..304ad7d4e 100644
--- a/src/components/Dissolution/AssociationDetails.vue
+++ b/src/components/Dissolution/AssociationDetails.vue
@@ -148,7 +148,7 @@ import { useStore } from '@/store/store'
 import { AuthServices } from '@/services/'
 import { AddressIF, ContactPointIF, OfficeAddressIF } from '@/interfaces'
 import { ContactInfo } from '@bcrs-shared-components/contact-info'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import OfficeAddresses from '@/components/common/OfficeAddresses.vue'
 import { CommonMixin, DateMixin } from '@/mixins'
 import { CoopTypes } from '@/enums'
diff --git a/src/components/Dissolution/CustodianOfRecords.vue b/src/components/Dissolution/CustodianOfRecords.vue
index 353bf8319..7a7d2630c 100644
--- a/src/components/Dissolution/CustodianOfRecords.vue
+++ b/src/components/Dissolution/CustodianOfRecords.vue
@@ -290,7 +290,7 @@ import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { CoopOfficeAddressSchema, OfficeAddressSchema } from '@/schemas'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import { AddressIF, AddressSchemaIF, CustodianResourceIF, FormIF, OrgPersonIF } from '@/interfaces'
 import { PartyTypes } from '@/enums'
 import { CommonMixin } from '@/mixins'
diff --git a/src/components/Registration/BusinessAddresses.vue b/src/components/Registration/BusinessAddresses.vue
index 850484f62..5057b6979 100644
--- a/src/components/Registration/BusinessAddresses.vue
+++ b/src/components/Registration/BusinessAddresses.vue
@@ -138,7 +138,7 @@ import { Component, Emit, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { isEmpty, isEqual } from 'lodash'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import { RegistrationMailingAddressSchema, RegistrationDeliveryAddressSchema } from '@/schemas'
 import { CommonMixin } from '@/mixins'
 import { AddressIF, BusinessAddressIF, RegistrationStateIF } from '@/interfaces'
diff --git a/src/components/common/AddEditOrgPerson.vue b/src/components/common/AddEditOrgPerson.vue
index 803e0a0b8..ed4db119d 100644
--- a/src/components/common/AddEditOrgPerson.vue
+++ b/src/components/common/AddEditOrgPerson.vue
@@ -283,7 +283,7 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import { ConfirmDialog } from '@bcrs-shared-components/confirm-dialog'
 import { AddEditOrgPersonMixin } from '@/mixins'
 
diff --git a/src/components/common/ListPeopleAndRoles.vue b/src/components/common/ListPeopleAndRoles.vue
index 11f2f86aa..a35771d8f 100644
--- a/src/components/common/ListPeopleAndRoles.vue
+++ b/src/components/common/ListPeopleAndRoles.vue
@@ -204,7 +204,7 @@
 import { Component, Mixins, Prop, Emit } from 'vue-property-decorator'
 import { Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import { CommonMixin } from '@/mixins'
 import { OrgPersonIF, PeopleAndRoleIF } from '@/interfaces'
 import { PartyTypes, RoleTypes, RouteNames } from '@/enums'
diff --git a/src/components/common/OfficeAddresses.vue b/src/components/common/OfficeAddresses.vue
index 48f5a7322..1ce0aeb12 100644
--- a/src/components/common/OfficeAddresses.vue
+++ b/src/components/common/OfficeAddresses.vue
@@ -325,7 +325,7 @@ import { Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
 import { isEmpty } from 'lodash'
 import { OfficeAddressSchema } from '@/schemas'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import { AddressIF, DefineCompanyIF, RegisteredRecordsAddressesIF } from '@/interfaces'
 import { CorpTypeCd } from '@bcrs-shared-components/enums/'
 import { CommonMixin } from '@/mixins'
diff --git a/src/components/common/RegAddEditOrgPerson.vue b/src/components/common/RegAddEditOrgPerson.vue
index 968192a76..0118a71da 100644
--- a/src/components/common/RegAddEditOrgPerson.vue
+++ b/src/components/common/RegAddEditOrgPerson.vue
@@ -442,7 +442,7 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import { mask } from 'vue-the-mask'
-import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
+import { BaseAddress } from '@bcrs-shared-components/base-address'
 import { ConfirmDialog } from '@bcrs-shared-components/confirm-dialog'
 import { BusinessLookup } from '@bcrs-shared-components/business-lookup'
 import HelpContactUs from '@/components/Registration/HelpContactUs.vue'
diff --git a/src/components/index.ts b/src/components/index.ts
index de198355f..b129f89bf 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -3,10 +3,8 @@
  * Do not import this file in this project - see README.md.
  */
 
-// external common components
-export { default as BaseAddress } from 'sbc-common-components/src/components/BaseAddress.vue'
-
 // external shared components
+export { BaseAddress } from '@bcrs-shared-components/base-address'
 export { ContactInfo } from '@bcrs-shared-components/contact-info'
 export { Certify } from '@bcrs-shared-components/certify'
 export { CourtOrderPoa } from '@bcrs-shared-components/court-order-poa'
diff --git a/vite.config.js b/vite.config.js
index 7c0ff983e..774f61e16 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -39,6 +39,10 @@ export default defineConfig(() => {
       },
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
     },
+    server: {
+      host: true,
+      port: 8080
+    },
     test: {
       // simulate DOM with happy-dom
       environment: 'happy-dom',