diff --git a/strr-web/components/bcros/form-section/contact-information/SummaryView.vue b/strr-web/components/bcros/form-section/contact-information/SummaryView.vue
new file mode 100644
index 000000000..f11e3cfba
--- /dev/null
+++ b/strr-web/components/bcros/form-section/contact-information/SummaryView.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+const { t } = useTranslation()
+const { header, contact } = defineProps<{
+  header: string,
+  contact: ContactI
+}>()
+
+const displayHostType = {
+  [HostContactTypeE.INDIVIDUAL]: t('createAccount.contactForm.hostTypeIndividual'),
+  [HostContactTypeE.BUSINESS]: t('createAccount.contactForm.hostTypeBusiness')
+}
+
+</script>
+
+<template>
+  <div>
+    <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
+      {{ header }}
+    </h2>
+    <div class="bg-white p-8 m:px-2 grid d:grid-cols-3 d:grid-rows-4 d:grid-flow-col">
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.hostType')"
+        :content="displayHostType[contact.contactType]"
+        data-test-id="contact-info-host-type"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.name')"
+        :content="displayContactFullName(contact.name)"
+        data-test-id="contact-info-name"
+      />
+      <div class="grid grid-rows-subgrid row-span-2">
+        <BcrosFormSectionReviewItem
+          :title="t('common.formLabels.preferredName')"
+          :content="contact.details.preferredName || '-'"
+          data-test-id="contact-info-preferred-name"
+        />
+      </div>
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.dateOfBirth')"
+        :content="convertDateToLongFormat(contact.dateOfBirth) || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.socialInsuranceNumber')"
+        :content="contact.socialInsuranceNumber || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.businessLegalName')"
+        :content="contact.businessLegalName || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.craBusinessNumber')"
+        :content="contact.businessNumber || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.phoneNumber')"
+        :content="displayPhoneAndExt(
+          contact.details.phoneNumber,
+          contact.details.extension) || '-'"
+        data-test-id="contact-info-phone"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.faxNumber')"
+        :content="displayFormattedPhone(contact.details.faxNumber) || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.emailAddress')"
+        :content="contact.details.emailAddress || '-'"
+        data-test-id="contact-info-email"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.mailingAddress')"
+        data-test-id="contact-info-address"
+      >
+        <!-- eslint-disable-next-line vue/no-v-html -->
+        <p v-html="displayFullAddress(contact.mailingAddress) || '-'" />
+      </BcrosFormSectionReviewItem>
+    </div>
+  </div>
+</template>
diff --git a/strr-web/components/bcros/form-section/property/SummaryView.vue b/strr-web/components/bcros/form-section/property/SummaryView.vue
index 94d22f9a8..e6eda188c 100644
--- a/strr-web/components/bcros/form-section/property/SummaryView.vue
+++ b/strr-web/components/bcros/form-section/property/SummaryView.vue
@@ -62,7 +62,7 @@ const propertyAddressDetails = computed((): UnitAddressAPII => {
       </div>
       <BcrosFormSectionReviewItem
         :title="tReview('isUnitOnPrincipalResidenceProperty')"
-        :content="propertyDetails.isUnitOnPrincipalResidenceProperty !== null
+        :content="propertyDetails.isUnitOnPrincipalResidenceProperty !== undefined
           ? tReview(String(propertyDetails.isUnitOnPrincipalResidenceProperty)) : '-'
         "
       />
diff --git a/strr-web/interfaces/account-i.ts b/strr-web/interfaces/account-i.ts
index 969a863c7..18589a614 100644
--- a/strr-web/interfaces/account-i.ts
+++ b/strr-web/interfaces/account-i.ts
@@ -56,6 +56,8 @@ export interface OrgI {
 export interface ContactI {
   socialInsuranceNumber: string
   businessNumber: string
+  businessLegalName: string
+  contactType: HostContactTypeE
   dateOfBirth: string
   details: {
     emailAddress: string
@@ -79,33 +81,8 @@ export interface ContactI {
   }
 }
 
-interface UserTermsI {
-  isTermsOfUseAccepted: boolean
-  termsOfUseAcceptedVersion: string
-}
-
-export interface ProfileI {
-  contacts: ContactI[]
-  created: string
-  firstname: string
-  id: number
-  idpUserid: string
-  keycloakGuid: string
-  lastname: string
-  loginSource: string
-  loginTime: string
-  modified: string
-  modifiedBy: string
-  type: string
-  userStatus: number
-  userTerms: UserTermsI
-  username: string
-  verified: boolean
-}
-
 export interface MeI {
   orgs: OrgI[]
-  profile: ProfileI
   settings: UserSettingsI[]
 }
 
diff --git a/strr-web/interfaces/terms-of-service-i.ts b/strr-web/interfaces/terms-of-service-i.ts
index ac9f0f547..d43c327b5 100644
--- a/strr-web/interfaces/terms-of-service-i.ts
+++ b/strr-web/interfaces/terms-of-service-i.ts
@@ -1,6 +1,4 @@
 export interface TermsOfServiceI {
   isTermsOfUseAccepted: boolean
   termsOfUseAcceptedVersion: string
-  termsOfUseCurrentVersion?: string
-  termsOfUse?: string
 }
diff --git a/strr-web/lang/en.json b/strr-web/lang/en.json
index 0cc3f0c7a..69bfa082e 100644
--- a/strr-web/lang/en.json
+++ b/strr-web/lang/en.json
@@ -11,6 +11,14 @@
     "formLabels": {
       "hostType": "Host Type",
       "contactName": "Contact Name",
+      "name": "Name",
+      "preferredName": "Preferred Name",
+      "dateOfBirth": "Date of Birth",
+      "socialInsuranceNumber": "Social Insurance Number",
+      "phoneNumber": "Phone Number",
+      "faxNumber": "Fax Number",
+      "emailAddress": "Email Address",
+      "mailingAddress": "Mailing Address",
       "businessDetails": "Business Details",
       "businessLegalName": "Business Legal Name",
       "businessLegalNameOptional" : "Business Legal Name (Optional)",
diff --git a/strr-web/pages/account-select.vue b/strr-web/pages/account-select.vue
index 33a38472c..8ad5058dc 100644
--- a/strr-web/pages/account-select.vue
+++ b/strr-web/pages/account-select.vue
@@ -42,7 +42,7 @@ const existingAccountsTitle = `${t('account.existingAccountSection.title')} (${u
 
 onMounted(() => {
   // if no sbc accounts navigate to sbc account creation
-  if (!me?.settings.length) {
+  if (!me?.orgs.length) {
     goToCreateSbcAccount()
   }
 })
diff --git a/strr-web/pages/application-details/[id]/index.vue b/strr-web/pages/application-details/[id]/index.vue
index fd0d95fff..d84c653ba 100644
--- a/strr-web/pages/application-details/[id]/index.vue
+++ b/strr-web/pages/application-details/[id]/index.vue
@@ -48,7 +48,7 @@
         <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
           {{ tApplicationDetails('applicationStatus') }}
         </h2>
-        <div class="bg-white py-[22px] px-[30px] mobile:px-5">
+        <div class="bg-white p-8 mobile:px-5">
           <div class="flex flex-row justify-between w-full mobile:flex-col">
             <BcrosFormSectionReviewItem :title="tApplicationDetails('status')">
               <p data-test-id="application-status-text">
@@ -58,125 +58,140 @@
           </div>
         </div>
       </div>
-      <div class="mt-10">
+      <div class="">
+        <!-- Property Manager -->
+        <BcrosFormSectionPropertyManagerSummaryView
+          v-if="applicationDetails.propertyManager"
+          :property-manager="applicationDetails.propertyManager"
+          header-tag="h2"
+          header-class="font-bold mb-6 mobile:mx-2 text-xl"
+          data-test-id="property-manager-details"
+          class="mt-10"
+        />
+
+        <!-- Host Information -->
+        <BcrosFormSectionContactInformationSummaryView
+          header="Host Information"
+          :contact="applicationDetails.primaryContact"
+          class="mt-10"
+          data-test-id="primary-contact"
+        />
+
+        <!-- Co-Host Information -->
+        <BcrosFormSectionContactInformationSummaryView
+          v-if="applicationDetails?.secondaryContact"
+          header="Co-Host Information"
+          :contact="applicationDetails.secondaryContact"
+          class="mt-10"
+          data-test-id="secondary-contact"
+        />
+
         <!-- Property Details -->
-        <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
-          {{ tReview('propertyDetails') }}
-        </h2>
-        <div class="bg-white p-8 m:px-2 grid d:grid-cols-3 d:grid-rows-5">
-          <BcrosFormSectionReviewItem
-            :title="tReview('nickname')"
-            :content="applicationDetails?.unitAddress.nickname || '-'"
-            data-test-id="unit-nickname"
-            class="break-all"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('rentalUnitSpaceType')"
-            :content="tApplicationDetails(applicationDetails?.unitDetails.rentalUnitSpaceType)|| '-'"
-            data-test-id="rentalUnitSpaceType-type"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('parcelIdentifier')"
-            :content="applicationDetails?.unitDetails.parcelIdentifier || '-'"
-            data-test-id="parcel-identifier"
-            class="break-all"
-          />
-          <div class="grid grid-rows-subgrid d:row-span-5">
-            <BcrosFormSectionReviewItem :title="tApplicationDetails('address')">
-              <p data-test-id="unit-address">
-                {{ applicationDetails?.unitAddress.streetNumber }} {{ applicationDetails?.unitAddress.streetName }}
-                {{ applicationDetails?.unitAddress.unitNumber
-                  ? `, ${applicationDetails?.unitAddress.unitNumber}`
-                  : ''
+        <div class="mt-10">
+          <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
+            {{ tReview('propertyDetails') }}
+          </h2>
+          <div class="bg-white p-8 m:px-2 grid d:grid-cols-3 d:grid-rows-5">
+            <BcrosFormSectionReviewItem
+              :title="tReview('nickname')"
+              :content="applicationDetails?.unitAddress.nickname || '-'"
+              data-test-id="unit-nickname"
+              class="break-all"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('rentalUnitSpaceType')"
+              :content="tApplicationDetails(applicationDetails?.unitDetails.rentalUnitSpaceType)|| '-'"
+              data-test-id="rentalUnitSpaceType-type"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('parcelIdentifier')"
+              :content="applicationDetails?.unitDetails.parcelIdentifier || '-'"
+              data-test-id="parcel-identifier"
+              class="break-all"
+            />
+            <div class="grid grid-rows-subgrid d:row-span-5">
+              <BcrosFormSectionReviewItem
+                :title="tApplicationDetails('address')"
+                data-test-id="unit-address"
+              >
+                <!-- eslint-disable-next-line vue/no-v-html -->
+                <p v-html="displayFullAddressWithStreetAttributes(applicationDetails?.unitAddress)" />
+              </BcrosFormSectionReviewItem>
+            </div>
+            <BcrosFormSectionReviewItem
+              :title="tReview('isUnitOnPrincipalResidenceProperty')"
+              :content="tApplicationDetails(
+                applicationDetails?.unitDetails.isUnitOnPrincipalResidenceProperty
+                  ? 'true'
+                  : 'false'
+              ) || '-'"
+              data-test-id="isUnitOnPrincipalResidenceProperty-type"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('businessLicense')"
+              :content="applicationDetails?.unitDetails.businessLicense || '-'"
+              data-test-id="business-license"
+              class="break-all"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('hostResidence')"
+              :content="applicationDetails?.unitDetails.hostResidence
+                ? tApplicationDetails(applicationDetails?.unitDetails.hostResidence) : '-'"
+              data-test-id="hostResidence-type"
+            />
+            <BcrosFormSectionReviewItem
+              v-if="applicationDetails?.unitDetails.businessLicenseExpiryDate"
+              :title="tReview('businessLicenseExpiryDate')"
+              :content="convertDateToLongFormat(applicationDetails?.unitDetails.businessLicenseExpiryDate)"
+              data-test-id="business-exp-date"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('numberOfRoomsForRent')"
+              :content="String(applicationDetails?.unitDetails.numberOfRoomsForRent) || '-'"
+            />
+            <div class="grid grid-rows-subgrid d:row-span-3">
+              <BcrosFormSectionReviewItem :title="tReview('listing')">
+                <template v-if="applicationDetails.listingDetails[0]?.url.length > 0">
+                  <a
+                    v-for="listing in applicationDetails.listingDetails"
+                    :key="listing.url"
+                    :href="listing.url"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    class="mb-1 truncate max-w-[250px]"
+                  >
+                    {{ listing.url }}
+                  </a>
+                </template>
+                <p v-else>
+                  -
+                </p>
+              </BcrosFormSectionReviewItem>
+            </div>
+            <BcrosFormSectionReviewItem :title="tReview('propertyType')">
+              <p data-test-id="property-type">
+                {{ applicationDetails?.unitDetails.propertyType
+                  ? tPropertyForm(
+                    propertyTypeMap[applicationDetails?.unitDetails.propertyType as keyof PropertyTypeMapI]
+                  )
+                  : '-'
                 }}
               </p>
-              <p v-if="applicationDetails?.unitAddress.addressLineTwo">
-                {{ applicationDetails?.unitAddress.addressLineTwo }}
-              </p>
-              <p>
-                {{ applicationDetails?.unitAddress.city || '-' }}
-                {{ applicationDetails?.unitAddress.province || '-' }}
-                {{ applicationDetails?.unitAddress.postalCode || '-' }}
-              </p>
-              <p>
-                {{ applicationDetails?.unitAddress.country
-                  ? regionNamesInEnglish.of(applicationDetails?.unitAddress.country)
-                  : '-' }}
-              </p>
-            </BcrosFormSectionReviewItem>
-          </div>
-          <BcrosFormSectionReviewItem
-            :title="tReview('isUnitOnPrincipalResidenceProperty')"
-            :content="tApplicationDetails(
-              applicationDetails?.unitDetails.isUnitOnPrincipalResidenceProperty
-                ? 'true'
-                : 'false'
-            ) || '-'"
-            data-test-id="isUnitOnPrincipalResidenceProperty-type"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('businessLicense')"
-            :content="applicationDetails?.unitDetails.businessLicense || '-'"
-            data-test-id="business-license"
-            class="break-all"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('hostResidence')"
-            :content="applicationDetails?.unitDetails.hostResidence
-              ? tApplicationDetails(applicationDetails?.unitDetails.hostResidence) : '-'"
-            data-test-id="hostResidence-type"
-          />
-          <BcrosFormSectionReviewItem
-            v-if="applicationDetails?.unitDetails.businessLicenseExpiryDate"
-            :title="tReview('businessLicenseExpiryDate')"
-            :content="convertDateToLongFormat(applicationDetails?.unitDetails.businessLicenseExpiryDate)"
-            data-test-id="business-exp-date"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('numberOfRoomsForRent')"
-            :content="String(applicationDetails?.unitDetails.numberOfRoomsForRent) || '-'"
-          />
-          <div class="grid grid-rows-subgrid d:row-span-3">
-            <BcrosFormSectionReviewItem :title="tReview('listing')">
-              <template v-if="applicationDetails.listingDetails[0]?.url.length > 0">
-                <a
-                  v-for="listing in applicationDetails.listingDetails"
-                  :key="listing.url"
-                  :href="listing.url"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  class="mb-1 truncate max-w-[250px]"
-                >
-                  {{ listing.url }}
-                </a>
-              </template>
-              <p v-else>
-                -
-              </p>
             </BcrosFormSectionReviewItem>
+            <BcrosFormSectionReviewItem
+              :title="tReview('ownershipType')"
+              :content="getOwnershipTypeDisplay(applicationDetails?.unitDetails.ownershipType, tApplicationDetails)"
+              data-test-id="ownership-type"
+            />
           </div>
-          <BcrosFormSectionReviewItem :title="tReview('propertyType')">
-            <p data-test-id="property-type">
-              {{ applicationDetails?.unitDetails.propertyType
-                ? tPropertyForm(
-                  propertyTypeMap[applicationDetails?.unitDetails.propertyType as keyof PropertyTypeMapI]
-                )
-                : '-'
-              }}
-            </p>
-          </BcrosFormSectionReviewItem>
-          <BcrosFormSectionReviewItem
-            :title="tReview('ownershipType')"
-            :content="getOwnershipTypeDisplay(applicationDetails?.unitDetails.ownershipType, tApplicationDetails)"
-            data-test-id="ownership-type"
-          />
         </div>
+
         <!-- Principal Residence -->
         <div class="mt-10" data-test-id="principal-residence">
           <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
             {{ tApplicationDetails('principalResidence') }}
           </h2>
-          <div class="bg-white py-[22px] px-[30px] mobile:px-5">
+          <div class="bg-white p-8 mobile:px-5">
             <BcrosFormSectionReviewItem :title="tApplicationDetails('proof')">
               <p data-test-id="principal-residence-proof">
                 {{
@@ -203,99 +218,13 @@
             </BcrosFormSectionReviewItem>
           </div>
         </div>
-        <!-- Property Manager -->
-        <BcrosFormSectionPropertyManagerSummaryView
-          v-if="applicationDetails.propertyManager"
-          :property-manager="applicationDetails.propertyManager"
-          header-tag="h2"
-          header-class="font-bold mb-6 mobile:mx-2 text-xl"
-          data-test-id="property-manager-details"
-          class="mt-10"
-        />
-        <!-- Primary Contact -->
-        <div class="mt-10" data-test-id="primary-contact">
-          <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
-            {{ tApplicationDetails('primaryContact') }}
-          </h2>
-          <div class="d:hidden">
-            <div class="bg-white py-[22px] px-[30px] mobile:px-5">
-              <BcrosFormSectionReviewItem
-                :title="tApplicationDetails('name')"
-                :content="(applicationDetails ? getContactRows(applicationDetails?.primaryContact) : [])[0].name"
-                data-test-id="primary-contact-name"
-              />
-              <BcrosFormSectionReviewItem
-                :title="tApplicationDetails('address')"
-                :content="(applicationDetails ? getContactRows(applicationDetails?.primaryContact) : [])[0].address"
-                data-test-id="primary-contact-address"
-              />
-              <BcrosFormSectionReviewItem
-                :title="tApplicationDetails('email')"
-                :content="(applicationDetails
-                  ? getContactRows(applicationDetails?.primaryContact) : [])[0]['Email Address']"
-                data-test-id="primary-contact-email"
-              />
-              <BcrosFormSectionReviewItem
-                :title="tApplicationDetails('phone')"
-                :content="(applicationDetails
-                  ? getContactRows(applicationDetails?.primaryContact) : [])[0]['Phone Number']"
-                data-test-id="primary-contact-phone"
-              />
-            </div>
-          </div>
-          <div class="overflow-x-scroll">
-            <UTable
-              :rows="applicationDetails ? getContactRows(applicationDetails?.primaryContact): []"
-              class="bg-white py-[22px] px-[30px] mobile:px-5 m:hidden w-[150%]"
-            />
-          </div>
-        </div>
-        <!-- Secondary Contact -->
-        <div
-          v-if="applicationDetails && applicationDetails?.secondaryContact"
-          class="mt-10"
-          data-test-id="secondary-contact"
-        >
-          <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
-            {{ tApplicationDetails('secondaryContact') }}
-          </h2>
-          <div class="d:hidden">
-            <div class="bg-white py-[22px] px-[30px] mobile:px-5">
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('name')">
-                <p data-test-id="secondary-contact-name">
-                  {{ (applicationDetails ? getContactRows(applicationDetails?.secondaryContact): [])[0].name }}
-                </p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('address')">
-                <p data-test-id="secondary-contact-address">
-                  {{ (applicationDetails ? getContactRows(applicationDetails?.secondaryContact): [])[0].address }}
-                </p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('email')">
-                <p data-test-id="secondary-contact-email">
-                  {{
-                    (applicationDetails ? getContactRows(applicationDetails?.secondaryContact): [])[0]['Email Address']
-                  }}
-                </p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('phone')">
-                <p data-test-id="secondary-contact-phone">
-                  {{
-                    (applicationDetails ? getContactRows(applicationDetails?.secondaryContact): [])[0]['Phone Number']
-                  }}
-                </p>
-              </BcrosFormSectionReviewItem>
-            </div>
-          </div>
-          <div class="bg-white py-[22px] px-[30px] mobile:px-5 m:hidden overflow-x-scroll w-[150%]">
-            <UTable :rows="getContactRows(applicationDetails?.secondaryContact)" />
-          </div>
-        </div>
+
+        <!-- Documents -->
         <div v-if="documents.length" class="mt-10" data-test-id="documents-section">
           <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
             {{ tApplicationDetails('documents') }}
           </h2>
-          <div class="bg-white py-[22px] px-[30px] mobile:px-5">
+          <div class="bg-white p-8 mobile:px-5">
             <div class="flex flex-row justify-between w-full mobile:flex-col">
               <BcrosFormSectionReviewItem :title="tApplicationDetails('proof')">
                 <div v-for="document in documents" :key="document.fileKey">
@@ -317,7 +246,9 @@
             </div>
           </div>
         </div>
+
         <template v-if="isExaminer">
+          <!-- LTSA Details  -->
           <div class="mt-10" data-test-id="ltsa-info-section">
             <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
               {{ tApplicationDetails('ltsaInfo') }}
@@ -330,6 +261,8 @@
               {{ tApplicationDetails('ltsaDetails') }}
             </a>
           </div>
+
+          <!-- Auto-Approval Logic -->
           <div class="mt-10" data-test-id="auto-approval-section">
             <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
               {{ tApplicationDetails('autoApprovalLogic') }}
@@ -344,6 +277,7 @@
           </div>
         </template>
 
+        <!-- Filing History -->
         <FilingHistory
           :header="tApplicationDetails('filing')"
           :history="applicationHistory"
@@ -375,8 +309,6 @@ const tReview = (translationKey: string) => t(`createAccount.review.${translatio
 const { isExaminer } = storeToRefs(useBcrosKeycloak())
 const { getChipFlavour } = useChipFlavour()
 
-const regionNamesInEnglish = new Intl.DisplayNames(['en'], { type: 'region' })
-
 // Modified for unit tests, unable to mock route params in tests
 const applicationNumber = route.params.id?.toString() || ''
 
@@ -395,7 +327,7 @@ const [application, applicationHistory]: [ApplicationI, FilingHistoryEventI[]] =
 
 setupBreadcrumbData(application)
 
-const applicationDetails: HostApplicationDetailsI = application.registration
+const applicationDetails = application.registration as HostApplicationDetailsI
 
 // Get Supporting Documents from the Application response
 const documents: DocumentUploadI[] = applicationDetails.documents || []
@@ -457,26 +389,4 @@ const downloadDocument = async (supportingDocument: DocumentUploadI) => {
   URL.revokeObjectURL(link.href)
 }
 
-const getContactRows = (contactBlock: ContactI) => [{
-  name: `
-    ${contactBlock.name.firstName}
-    ${contactBlock.name.middleName
-      ? ` ${contactBlock.name.middleName} `
-      : ' '
-    }
-     ${contactBlock.name.lastName}
-  `,
-  address: `
-    ${contactBlock.mailingAddress.address}
-    ${contactBlock.mailingAddress.addressLineTwo || ''}
-    ${contactBlock.mailingAddress.city}
-    ${contactBlock.mailingAddress.province}
-    ${contactBlock.mailingAddress.postalCode}
-  `,
-  'Email Address': contactBlock.details.emailAddress,
-  'Phone Number': displayPhoneAndExt(contactBlock.details.phoneNumber, contactBlock.details.extension) || '',
-  SIN: contactBlock.socialInsuranceNumber,
-  'BN (GST)': contactBlock.businessNumber
-}]
-
 </script>
diff --git a/strr-web/pages/create-account.vue b/strr-web/pages/create-account.vue
index 1acc93f3e..1b38a960c 100644
--- a/strr-web/pages/create-account.vue
+++ b/strr-web/pages/create-account.vue
@@ -132,7 +132,7 @@ const { createApplication } = useApplications()
 const submitInProgress = ref(false)
 onMounted(() => {
   // if no SBC accounts exist redirect to SBC account creation
-  if (!me?.settings.length) {
+  if (!me?.orgs.length) {
     goToCreateSbcAccount()
   }
   updateFees()
diff --git a/strr-web/pages/registration-details/[id]/index.vue b/strr-web/pages/registration-details/[id]/index.vue
index a290508a1..baecc85dc 100644
--- a/strr-web/pages/registration-details/[id]/index.vue
+++ b/strr-web/pages/registration-details/[id]/index.vue
@@ -20,7 +20,7 @@
         <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
           {{ tApplicationDetails('registrationStatus') }}
         </h2>
-        <div class="bg-white py-[22px] px-[30px] mobile:px-2">
+        <div class="bg-white p-8 mobile:px-2">
           <div class="flex flex-row justify-between w-full mobile:flex-col">
             <BcrosFormSectionReviewItem :title="tApplicationDetails('status')">
               <p>{{ displayRegistrationStatus() }}</p>
@@ -28,117 +28,7 @@
           </div>
         </div>
       </div>
-      <div class="mt-10">
-        <!-- Property Details -->
-        <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
-          {{ tReview('propertyDetails') }}
-        </h2>
-        <div class="bg-white p-8 m:px-2 grid d:grid-cols-3 d:grid-rows-5">
-          <BcrosFormSectionReviewItem
-            :title="tReview('nickname')"
-            :content="application?.unitAddress.nickname || '-'"
-            data-test-id="unit-nickname"
-            class="break-all"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('rentalUnitSpaceType')"
-            :content="application?.unitDetails.rentalUnitSpaceType
-              ? tApplicationDetails(application.unitDetails.rentalUnitSpaceType) : '-'
-            "
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('parcelIdentifier')"
-            :content="application?.unitDetails.parcelIdentifier || '-'"
-            data-test-id="parcel-identifier"
-            class="break-all"
-          />
-          <div class="grid grid-rows-subgrid d:row-span-5">
-            <BcrosFormSectionReviewItem :title="tApplicationDetails('address')">
-              <p data-test-id="unit-address">
-                {{ application?.unitAddress.streetNumber }} {{ application?.unitAddress.streetName }}
-                {{ application?.unitAddress.unitNumber ? `, ${application?.unitAddress.unitNumber}` : '' }}
-              </p>
-              <p v-if="application?.unitAddress.addressLineTwo">
-                {{ application?.unitAddress.addressLineTwo }}
-              </p>
-              <p>
-                {{ application?.unitAddress.city || '-' }}
-                {{ application?.unitAddress.province || '-' }}
-                {{ application?.unitAddress.postalCode || '-' }}
-              </p>
-              <p>
-                {{ application?.unitAddress.country
-                  ? regionNamesInEnglish.of(application?.unitAddress.country)
-                  : '-' }}
-              </p>
-            </BcrosFormSectionReviewItem>
-          </div>
-          <BcrosFormSectionReviewItem
-            :title="tReview('isUnitOnPrincipalResidenceProperty')"
-            :content="tApplicationDetails(
-              application?.unitDetails.isUnitOnPrincipalResidenceProperty
-                ? 'true'
-                : 'false'
-            )"
-            data-test-id="isUnitOnPrincipalResidenceProperty-type"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('businessLicense')"
-            :content="application?.unitDetails.businessLicense || '-'"
-            data-test-id="business-license"
-            class="break-all"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('hostResidence')"
-            :content="application?.unitDetails.hostResidence
-              ? tApplicationDetails(application?.unitDetails.hostResidence) : '-'"
-            data-test-id="hostResidence-type"
-          />
-          <BcrosFormSectionReviewItem
-            v-if="application?.unitDetails.businessLicenseExpiryDate"
-            :title="tReview('businessLicenseExpiryDate')"
-            :content="convertDateToLongFormat(application?.unitDetails.businessLicenseExpiryDate)"
-            data-test-id="business-exp-date"
-          />
-          <BcrosFormSectionReviewItem
-            :title="tReview('numberOfRoomsForRent')"
-            :content="String(application?.unitDetails.numberOfRoomsForRent) || '-'"
-          />
-          <div class="grid grid-rows-subgrid d:row-span-3">
-            <BcrosFormSectionReviewItem :title="tReview('listing')">
-              <template v-if="application.listingDetails[0]?.url.length > 0">
-                <a
-                  v-for="listing in application.listingDetails"
-                  :key="listing.url"
-                  :href="listing.url"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  class="mb-1 truncate max-w-[250px]"
-                >
-                  {{ listing.url }}
-                </a>
-              </template>
-              <p v-else>
-                -
-              </p>
-            </BcrosFormSectionReviewItem>
-          </div>
-          <BcrosFormSectionReviewItem :title="tReview('propertyType')">
-            <p data-test-id="property-type">
-              {{ application?.unitDetails.propertyType
-                ? tPropertyForm(
-                  propertyTypeMap[application?.unitDetails.propertyType as keyof PropertyTypeMapI]
-                )
-                : '-'
-              }}
-            </p>
-          </BcrosFormSectionReviewItem>
-          <BcrosFormSectionReviewItem
-            :title="tReview('ownershipType')"
-            :content="getOwnershipTypeDisplay(application?.unitDetails.ownershipType, tApplicationDetails)"
-            data-test-id="ownership-type"
-          />
-        </div>
+      <div class="">
         <!-- Property Manager -->
         <BcrosFormSectionPropertyManagerSummaryView
           v-if="application.propertyManager"
@@ -148,65 +38,164 @@
           data-test-id="property-manager-details"
           class="mt-10"
         />
-        <!-- Primary Contact Info -->
+
+        <!-- Host Information -->
+        <BcrosFormSectionContactInformationSummaryView
+          header="Host Information"
+          :contact="application.primaryContact"
+          class="mt-10"
+          data-test-id="primary-contact"
+        />
+
+        <!-- Co-Host Information -->
+        <BcrosFormSectionContactInformationSummaryView
+          v-if="application?.secondaryContact"
+          header="Co-Host Information"
+          :contact="application.secondaryContact"
+          class="mt-10"
+          data-test-id="secondary-contact"
+        />
+
+        <!-- Property Details -->
         <div class="mt-10">
           <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
-            {{ tApplicationDetails('primaryContact') }}
+            {{ tReview('propertyDetails') }}
           </h2>
-          <div class="d:hidden">
-            <div class="bg-white py-[22px] px-[30px] mobile:px-2">
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('name')">
-                <p>{{ (application ? getContactRows(application?.primaryContact): [])[0].name }}</p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('address')">
-                <p>{{ (application ? getContactRows(application?.primaryContact): [])[0].address }}</p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('email')">
-                <p>{{ (application ? getContactRows(application?.primaryContact): [])[0]['Email Address'] }}</p>
+          <div class="bg-white p-8 m:px-2 grid d:grid-cols-3 d:grid-rows-5">
+            <BcrosFormSectionReviewItem
+              :title="tReview('nickname')"
+              :content="application?.unitAddress.nickname || '-'"
+              data-test-id="unit-nickname"
+              class="break-all"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('rentalUnitSpaceType')"
+              :content="application?.unitDetails.rentalUnitSpaceType
+                ? tApplicationDetails(application.unitDetails.rentalUnitSpaceType) : '-'
+              "
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('parcelIdentifier')"
+              :content="application?.unitDetails.parcelIdentifier || '-'"
+              data-test-id="parcel-identifier"
+              class="break-all"
+            />
+            <div class="grid grid-rows-subgrid d:row-span-5">
+              <BcrosFormSectionReviewItem
+                :title="tApplicationDetails('address')"
+                data-test-id="unit-address"
+              >
+                <!-- eslint-disable-next-line vue/no-v-html -->
+                <p v-html="displayFullAddressWithStreetAttributes(application?.unitAddress)" />
               </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('phone')">
-                <p>{{ (application ? getContactRows(application?.primaryContact): [])[0]['Phone Number'] }}</p>
+            </div>
+            <BcrosFormSectionReviewItem
+              :title="tReview('isUnitOnPrincipalResidenceProperty')"
+              :content="tApplicationDetails(
+                application?.unitDetails.isUnitOnPrincipalResidenceProperty
+                  ? 'true'
+                  : 'false'
+              )"
+              data-test-id="isUnitOnPrincipalResidenceProperty-type"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('businessLicense')"
+              :content="application?.unitDetails.businessLicense || '-'"
+              data-test-id="business-license"
+              class="break-all"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('hostResidence')"
+              :content="application?.unitDetails.hostResidence
+                ? tApplicationDetails(application?.unitDetails.hostResidence) : '-'"
+              data-test-id="hostResidence-type"
+            />
+            <BcrosFormSectionReviewItem
+              v-if="application?.unitDetails.businessLicenseExpiryDate"
+              :title="tReview('businessLicenseExpiryDate')"
+              :content="convertDateToLongFormat(application?.unitDetails.businessLicenseExpiryDate)"
+              data-test-id="business-exp-date"
+            />
+            <BcrosFormSectionReviewItem
+              :title="tReview('numberOfRoomsForRent')"
+              :content="String(application?.unitDetails.numberOfRoomsForRent) || '-'"
+            />
+            <div class="grid grid-rows-subgrid d:row-span-3">
+              <BcrosFormSectionReviewItem :title="tReview('listing')">
+                <template v-if="application.listingDetails[0]?.url.length > 0">
+                  <a
+                    v-for="listing in application.listingDetails"
+                    :key="listing.url"
+                    :href="listing.url"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    class="mb-1 truncate max-w-[250px]"
+                  >
+                    {{ listing.url }}
+                  </a>
+                </template>
+                <p v-else>
+                  -
+                </p>
               </BcrosFormSectionReviewItem>
             </div>
-          </div>
-          <div class="overflow-x-scroll">
-            <UTable
-              :rows="application ? getContactRows(application?.primaryContact): []"
-              class="bg-white py-[22px] px-[30px] mobile:px-5 m:hidden w-[150%]"
+            <BcrosFormSectionReviewItem :title="tReview('propertyType')">
+              <p data-test-id="property-type">
+                {{ application?.unitDetails.propertyType
+                  ? tPropertyForm(
+                    propertyTypeMap[application?.unitDetails.propertyType as keyof PropertyTypeMapI]
+                  )
+                  : '-'
+                }}
+              </p>
+            </BcrosFormSectionReviewItem>
+            <BcrosFormSectionReviewItem
+              :title="tReview('ownershipType')"
+              :content="getOwnershipTypeDisplay(application?.unitDetails.ownershipType, tApplicationDetails)"
+              data-test-id="ownership-type"
             />
           </div>
         </div>
-        <!-- Secondary Contact Info -->
-        <div v-if="application && application?.secondaryContact" class="mt-10">
+
+        <!-- Principal Residence -->
+        <div class="mt-10" data-test-id="principal-residence">
           <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
-            {{ tApplicationDetails('secondaryContact') }}
+            {{ tApplicationDetails('principalResidence') }}
           </h2>
-          <div class="d:hidden">
-            <div class="bg-white py-[22px] px-[30px] mobile:px-2">
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('name')">
-                <p>{{ (application ? getContactRows(application?.secondaryContact): [])[0].name }}</p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('address')">
-                <p>{{ (application ? getContactRows(application?.secondaryContact): [])[0].address }}</p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('email')">
-                <p>{{ (application ? getContactRows(application?.secondaryContact): [])[0]['Email Address'] }}</p>
-              </BcrosFormSectionReviewItem>
-              <BcrosFormSectionReviewItem :title="tApplicationDetails('phone')">
-                <p>{{ (application ? getContactRows(application?.secondaryContact): [])[0]['Phone Number'] }}</p>
-              </BcrosFormSectionReviewItem>
-            </div>
-          </div>
-          <div class="bg-white py-[22px] px-[30px] mobile:px-2 m:hidden overflow-x-scroll w-[150%]">
-            <UTable :rows="getContactRows(application?.secondaryContact)" />
+          <div class="bg-white p-8 mobile:px-5">
+            <BcrosFormSectionReviewItem :title="tApplicationDetails('proof')">
+              <p data-test-id="principal-residence-proof">
+                {{
+                  application.principalResidence.isPrincipalResidence
+                    ? tApplicationDetails('principalResidenceApplies')
+                    : tApplicationDetails('principalResidenceNotApplies')
+                }}
+              </p>
+            </BcrosFormSectionReviewItem>
+            <BcrosFormSectionReviewItem
+              v-if="application.principalResidence.nonPrincipalOption"
+              :title="tApplicationDetails('principalResidenceReason')"
+              class="mt-4"
+            >
+              <p>{{ application.principalResidence.nonPrincipalOption }}</p>
+            </BcrosFormSectionReviewItem>
+            <BcrosFormSectionReviewItem
+              v-if="application.principalResidence.specifiedServiceProvider &&
+                application.principalResidence.specifiedServiceProvider !== 'n/a'"
+              :title="tApplicationDetails('principalResidenceServiceProvider')"
+              class="mt-4"
+            >
+              <p>{{ application.principalResidence.specifiedServiceProvider }}</p>
+            </BcrosFormSectionReviewItem>
           </div>
         </div>
+
         <!-- Documents -->
         <div v-if="documents.length" class="mt-10">
           <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
             {{ tApplicationDetails('documents') }}
           </h2>
-          <div class="bg-white py-[22px] px-[30px] mobile:px-2">
+          <div class="bg-white p-8 mobile:px-2">
             <div class="flex flex-row justify-between w-full mobile:flex-col">
               <BcrosFormSectionReviewItem :title="tApplicationDetails('proof')">
                 <div v-for="document in documents" :key="document.fileKey">
@@ -227,7 +216,9 @@
             </div>
           </div>
         </div>
+
         <template v-if="isExaminer">
+          <!-- LTSA Details  -->
           <div class="mt-10">
             <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
               {{ tApplicationDetails('ltsaInfo') }}
@@ -239,6 +230,8 @@
               {{ tApplicationDetails('ltsaDetails') }}
             </a>
           </div>
+
+          <!-- Auto-Approval Logic -->
           <div class="mt-10">
             <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
               {{ tApplicationDetails('autoApprovalLogic') }}
@@ -251,13 +244,14 @@
             </a>
           </div>
         </template>
+
         <!-- Filing History -->
         <div class="mt-10">
           <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
             {{ tApplicationDetails('filing') }}
           </h2>
 
-          <div class="bg-white py-[22px] px-[30px] mobile:px-2">
+          <div class="bg-white p-8 mobile:px-2">
             <div class="flex flex-col justify-between w-full">
               <div
                 v-for="(event, index) in history.reverse()"
@@ -308,8 +302,6 @@ const tReview = (translationKey: string) => t(`createAccount.review.${translatio
 const { isExaminer } = useBcrosKeycloak()
 const { getChipFlavour } = useChipFlavour()
 
-const regionNamesInEnglish = new Intl.DisplayNames(['en'], { type: 'region' })
-
 const registrationId = route.params.id.toString()
 
 const {
@@ -390,25 +382,4 @@ const displayRegistrationStatus = () => {
     : '-'
   return tStatuses(statusTranslation)
 }
-const getContactRows = (contactBlock: ContactI) => [{
-  name: `
-      ${contactBlock.name.firstName}
-      ${contactBlock.name.middleName
-        ? ` ${contactBlock.name.middleName} `
-        : ' '
-      }
-       ${contactBlock.name.lastName}
-    `,
-  address: `
-      ${contactBlock.mailingAddress.address}
-      ${contactBlock.mailingAddress.addressLineTwo}
-      ${contactBlock.mailingAddress.city}
-      ${contactBlock.mailingAddress.province}
-      ${contactBlock.mailingAddress.postalCode}
-    `,
-  'Email Address': contactBlock.details.emailAddress,
-  'Phone Number': displayPhoneAndExt(contactBlock.details.phoneNumber, contactBlock.details.extension) || '',
-  SIN: contactBlock.socialInsuranceNumber,
-  'BN (GST)': contactBlock.businessNumber
-}]
 </script>
diff --git a/strr-web/pages/registry-dashboard.vue b/strr-web/pages/registry-dashboard.vue
index b54ce899e..5d2e1c8ba 100644
--- a/strr-web/pages/registry-dashboard.vue
+++ b/strr-web/pages/registry-dashboard.vue
@@ -89,11 +89,11 @@
         <template #registrationNumber-data="{ row }">
           <div class="flex items-center">
             <div
-              :class="{ 'cursor-pointer': isClickableRow(row.registrationType) }"
+              :class="{ 'cursor-pointer': isClickableRow(row.registrationType) && row.registrationId }"
               class="text-center min-w-[80px]"
               @click="row.registrationId
                 ? handleRowClick(row.registrationType, row.registrationId, false)
-                : handleRowClick(row.registrationType, row.applicationNumber)
+                : null
               "
             >
               {{ row.registrationNumber }}
@@ -199,7 +199,7 @@ const { isExaminer } = storeToRefs(useBcrosKeycloak())
 const statusFilter = ref<string>('')
 const offset = ref<number>(0)
 const currentPage = ref<number>(1)
-const tableRows = ref<Record<string, string>[]>([])
+const tableRows = ref<ExaminerDashboardRowI[]>([])
 const totalResults = ref<number>(0)
 const loading = ref<boolean>(true)
 const maxPageResults = ref<number>(0)
@@ -210,7 +210,11 @@ const searchAppInput = ref<string>('')
 
 const DEFAULT_STATUS: ApplicationStatusE = ApplicationStatusE.FULL_REVIEW
 
-const isClickableRow = (registrationType: string) => registrationType !== 'Platform'
+// Display readable types in the table
+const PLATFORM_TYPE = 'Platform'
+const STRATA_HOTEL_TYPE = 'Strata Hotel'
+
+const isClickableRow = (registrationType: string) => ![PLATFORM_TYPE, STRATA_HOTEL_TYPE].includes(registrationType)
 
 const handleRowClick = (registrationType: string, identifier: string, isApplication: boolean = true) => {
   if (!isClickableRow(registrationType)) {
@@ -289,8 +293,8 @@ const updateTableRows = async () => {
   loading.value = false
 }
 
-const registrationsToTableRows = (applications: PaginatedApplicationsI): Record<string, string>[] => {
-  const rows: Record<string, string>[] = []
+const registrationsToTableRows = (applications: PaginatedApplicationsI): ExaminerDashboardRowI[] => {
+  const rows: ExaminerDashboardRowI[] = []
   for (const application of applications.applications) {
     const {
       header: {
@@ -307,7 +311,7 @@ const registrationsToTableRows = (applications: PaginatedApplicationsI): Record<
     let applicantName = ''
     let propertyAddress = ''
     if (registrationType === RegistrationTypeE.HOST) {
-      const hostApplication: HostApplicationDetailsI = application.registration
+      const hostApplication: HostApplicationDetailsI = application.registration as HostApplicationDetailsI
       if (hostApplication.propertyManager && hostApplication.propertyManager.initiatedByPropertyManager) {
         applicationType = 'Property Manager'
       } else {
@@ -316,12 +320,12 @@ const registrationsToTableRows = (applications: PaginatedApplicationsI): Record<
       applicantName = displayContactFullName(hostApplication.primaryContact.name) || ''
       propertyAddress = formatPropertyAddress(hostApplication.unitAddress)
     } else if (registrationType === RegistrationTypeE.PLATFORM) {
-      const platformApplication: PlatformApplicationDetailsI = application.registration
-      applicationType = 'Platform'
+      const platformApplication: PlatformApplicationDetailsI = application.registration as PlatformApplicationDetailsI
+      applicationType = PLATFORM_TYPE
       applicantName = platformApplication.businessDetails.legalName
       propertyAddress = formatMailingAddress(platformApplication.businessDetails.mailingAddress)
     } else if (registrationType === RegistrationTypeE.STRATA_HOTEL) {
-      applicationType = 'Strata Hotel'
+      applicationType = STRATA_HOTEL_TYPE
       // Implement this once the backend supports it
     }
     const row: ExaminerDashboardRowI = {
@@ -333,7 +337,8 @@ const registrationsToTableRows = (applications: PaginatedApplicationsI): Record<
       applicantName,
       status: examinerStatus || status,
       submissionDate: applicationDateTime,
-      isPaid: hasPaymentReceipt(status)
+      isPaid: hasPaymentReceipt(status),
+      isCertificateIssued: application.header.isCertificateIssued
     }
     rows.push(row)
   }
diff --git a/strr-web/stores/account.ts b/strr-web/stores/account.ts
index c1dce86be..d1b1eefd0 100644
--- a/strr-web/stores/account.ts
+++ b/strr-web/stores/account.ts
@@ -78,8 +78,8 @@ export const useBcrosAccount = defineStore('bcros/account', () => {
         if (!data) {
           throw new Error('Invalid STRR API response')
         }
-        me.value = data as MeI
-        return data as MeI
+        me.value = data
+        return data
       })
       .catch((error) => {
         console.warn('Error fetching me object.')
diff --git a/strr-web/tests/mocks/mockApplication.ts b/strr-web/tests/mocks/mockApplication.ts
index 2bf9070c6..6f1105f5b 100644
--- a/strr-web/tests/mocks/mockApplication.ts
+++ b/strr-web/tests/mocks/mockApplication.ts
@@ -74,7 +74,9 @@ export const mockSecondaryContact: SecondaryContactInformationI = {
 export const mockApplicationDetails: HostApplicationDetailsI = {
   listingDetails: [],
   primaryContact: {
+    contactType: HostContactTypeE.INDIVIDUAL,
     businessNumber: '',
+    businessLegalName: '',
     dateOfBirth: '1955-07-11',
     details: {
       emailAddress: 'test1@email.com',
@@ -170,6 +172,7 @@ export const mockApplicationApprovedWithSecondaryContact: ApplicationI = {
   registration: {
     ...mockApplicationDetails,
     secondaryContact: {
+      contactType: HostContactTypeE.INDIVIDUAL,
       details: {
         emailAddress: 'secondary@email.com',
         faxNumber: '',
@@ -184,6 +187,7 @@ export const mockApplicationApprovedWithSecondaryContact: ApplicationI = {
       },
       socialInsuranceNumber: '',
       businessNumber: '',
+      businessLegalName: '',
       dateOfBirth: '1990-01-01',
       mailingAddress: {
         address: '789 Test',
diff --git a/strr-web/tests/mocks/mockData.ts b/strr-web/tests/mocks/mockData.ts
index 5792e2d58..6cf69865f 100644
--- a/strr-web/tests/mocks/mockData.ts
+++ b/strr-web/tests/mocks/mockData.ts
@@ -1,5 +1,3 @@
-import type { ProfileI } from '~/interfaces/account-i'
-
 export const testParsedToken = {
   firstname: 'First',
   lastname: 'Last',
@@ -207,33 +205,12 @@ export const mockContact: ContactI = {
     firstName: 'John',
     lastName: 'Doe',
     middleName: 'Michael'
-  }
-}
-
-export const mockProfile: ProfileI = {
-  contacts: [mockContact],
-  created: '',
-  firstname: '',
-  id: 0,
-  idpUserid: '',
-  keycloakGuid: '',
-  lastname: '',
-  loginSource: '',
-  loginTime: '',
-  modified: '',
-  modifiedBy: '',
-  type: '',
-  userStatus: 0,
-  userTerms: {
-    isTermsOfUseAccepted: true,
-    termsOfUseAcceptedVersion: ''
   },
-  username: '',
-  verified: true
+  businessLegalName: '',
+  contactType: HostContactTypeE.INDIVIDUAL
 }
 
 export const testMe: MeI = {
   orgs: [testDetailsForDev1],
-  profile: mockProfile,
   settings: mockUserSettings
 }
diff --git a/strr-web/tests/unit/pages/application-details.spec.ts b/strr-web/tests/unit/pages/application-details.spec.ts
index c4d3ef78f..5271bdfd0 100644
--- a/strr-web/tests/unit/pages/application-details.spec.ts
+++ b/strr-web/tests/unit/pages/application-details.spec.ts
@@ -8,6 +8,8 @@ import {
   mockApplicationApprovedWithDocuments
 } from '~/tests/mocks/mockApplication'
 
+import { BcrosFormSectionReviewItem } from '#components'
+
 const { t } = useTranslation()
 const tApplicationDetails = (key: string) => t(`applicationDetails.${key}`)
 const tStatuses = (key: string) => t(`statuses.${key}`)
@@ -79,13 +81,17 @@ describe('Application Details Page', () => {
   })
 
   it('displays primary contact information correctly', async () => {
+    mockUseApplications(mockApplicationApproved)
+
+    const mockPrimaryContact = (mockApplicationApproved.registration as HostApplicationDetailsI).primaryContact
+
     wrapper = await mountSuspended(ApplicationDetails)
-    const primaryContact = wrapper.findTestId('primary-contact')
+    const primaryContact = wrapper.findComponent('[data-test-id=primary-contact]')
     expect(primaryContact.exists()).toBe(true)
-    expect(wrapper.findTestId('primary-contact-name').exists()).toBe(true)
-    expect(wrapper.findTestId('primary-contact-email').exists()).toBe(true)
-    expect(wrapper.findTestId('primary-contact-phone').exists()).toBe(true)
-    expect(wrapper.findTestId('primary-contact-address').exists()).toBe(true)
+    expect(primaryContact.findAllComponents(BcrosFormSectionReviewItem)).toHaveLength(11)
+    expect(primaryContact.findTestId('contact-info-host-type').text()).toContain('Individual')
+    expect(primaryContact.findTestId('contact-info-email').text()).toContain(mockPrimaryContact.details.emailAddress)
+    expect(primaryContact.findTestId('contact-info-name').text()).toContain(mockPrimaryContact.name.firstName)
   })
 
   it('displays payment due banner when payment is due', async () => {
@@ -121,9 +127,17 @@ describe('Application Details Page', () => {
   it('displays secondary contact information when available', async () => {
     mockUseApplications(mockApplicationApprovedWithSecondaryContact)
 
+    const mockSecondaryContact =
+      (mockApplicationApprovedWithSecondaryContact.registration as HostApplicationDetailsI).secondaryContact as ContactI
+
     wrapper = await mountSuspended(ApplicationDetails)
-    const secondaryContact = wrapper.findTestId('secondary-contact')
+    const secondaryContact = wrapper.findComponent('[data-test-id=secondary-contact]')
     expect(secondaryContact.exists()).toBe(true)
-    expect(wrapper.findTestId('secondary-contact-email').text()).toContain('secondary@email.com')
+    expect(secondaryContact.findAllComponents(BcrosFormSectionReviewItem)).toHaveLength(11)
+    expect(secondaryContact.findTestId('contact-info-host-type').text()).toContain('Individual')
+    expect(secondaryContact.findTestId('contact-info-email').text())
+      .toContain(mockSecondaryContact.details.emailAddress)
+    expect(secondaryContact.findTestId('contact-info-name').text())
+      .toContain(mockSecondaryContact.name.firstName)
   })
 })
diff --git a/strr-web/utils/format-helper.ts b/strr-web/utils/format-helper.ts
index ea10eefea..ed2aa6944 100644
--- a/strr-web/utils/format-helper.ts
+++ b/strr-web/utils/format-helper.ts
@@ -35,7 +35,7 @@ export function convertDateToLongFormat (dateString: string): string {
  * @returns a formatted phone number
  * @example "5554443322" -> "555-444-3322"
  */
-function displayFormattedPhone (phoneNumber: string): string {
+export function displayFormattedPhone (phoneNumber: string): string {
   // Filter only numbers from the input
   const cleaned = phoneNumber.replace(/\D/g, '')