diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
index f6b645143..114ba865f 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
@@ -77,8 +77,21 @@
           <div v-else>
             <label class="generic-label" for="org-name">
               Business or Organization Name
+              <v-tooltip
+                v-if="disableNameFields"
+                top
+                content-class="top-tooltip pa-5"
+                transition="fade-transition"
+              >
+                <template v-slot:activator="{ on }">
+                  <v-icon class="mt-n1" color="primary" v-on="on">
+                    mdi-information-outline
+                  </v-icon>
+                </template>
+                {{ disabledNameEditTooltip }}
+              </v-tooltip>
             </label>
-            <v-row>
+            <v-row v-if="!isCurrentOwner(owner)">
               <v-col>
                 <p>
                   You can find the full legal name of an active B.C. business by entering the name
@@ -178,7 +191,9 @@
                   filled
                   id="org-name"
                   ref="orgNameSearchField"
-                  label="Find or enter the Full Legal Name of the Business or Organization"
+                  :label="isCurrentOwner(owner)
+                    ? 'Full Legal Name of Business or Organization'
+                    : 'Find or enter the Full Legal Name of the Business or Organization'"
                   v-model="searchValue"
                   persistent-hint
                   :rules="orgNameRules"
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
index deb8c821d..ad770527a 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
@@ -25,7 +25,7 @@
               v-on="on"
               :id="role.id"
               :class="role.class"
-              :disabled="isDisabledRadio(role.model)"
+              :disabled="isDisabledRadio(role.model) && selectedPartyType !== role.model"
               v-model="role.model"
             >
               <template v-slot:label>