diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index 32cf68491..49f404b5c 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.3.7",
+  "version": "3.3.8",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.3.7",
+      "version": "3.3.8",
       "dependencies": {
         "@bcrs-shared-components/input-field-date-picker": "^1.0.0",
         "@lemoncode/fonk": "^1.5.1",
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index d42c6b618..a3e6bc6ee 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.3.7",
+  "version": "3.3.8",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
index d02e4bd80..b8248c049 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
@@ -25,6 +25,7 @@
         <!-- Owner Roles Component-->
         <HomeOwnerRoles
           :partyType="owner.partyType"
+          :disableRoles="isCurrentOwner(owner)"
           @update:partyType="owner.partyType = $event"
         />
 
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
index b510a3fef..348a1cb2c 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
@@ -28,7 +28,8 @@
               :id="role.id"
               :value="role.model"
               :class="role.class"
-              :disabled="isDisabledRadio(role.model) && selectedPartyType !== role.model"
+              :disabled="(isDisabledRadio(role.model) && selectedPartyType !== role.model) ||
+                (disableRoles && selectedPartyType !== role.model)"
             >
               <template #label>
                 <div
@@ -60,6 +61,10 @@ export default defineComponent({
     partyType: {
       type: String as PropType<HomeOwnerPartyTypes>,
       default: null
+    },
+    disableRoles: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ['update:partyType'],
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
index 74f1850da..3a95edef4 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
@@ -429,26 +429,63 @@
                       />
                     </v-btn>
 
-                    <v-btn
-                      v-if="isRemovedHomeOwner(item) || isChangedOwner(item)"
-                      variant="plain"
-                      color="primary"
-                      class="mx-0 px-0"
-                      :ripple="false"
-                      :disabled="isAddingMode || isEditingMode || isGlobalEditingMode"
-                      data-test-id="table-undo-btn"
-                      @click="undo(item)"
-                    >
-                      <v-icon size="small">
-                        mdi-undo
-                      </v-icon>
-                      <span>Undo</span>
-                      <v-divider
-                        v-if="enableTransferOwnerMenuActions(item) && !isRemovedHomeOwner(item)"
-                        class="ma-0 pl-3"
-                        vertical
-                      />
-                    </v-btn>
+                    <template v-if="isRemovedHomeOwner(item) || isChangedOwner(item)">
+                      <v-btn
+                        variant="plain"
+                        color="primary"
+                        class="mx-0 px-0"
+                        :ripple="false"
+                        :disabled="isAddingMode || isEditingMode || isGlobalEditingMode"
+                        data-test-id="table-undo-btn"
+                        @click="undo(item)"
+                      >
+                        <v-icon size="small">
+                          mdi-undo
+                        </v-icon>
+                        <span>Undo</span>
+                        <v-divider
+                          v-if="enableTransferOwnerMenuActions(item) && !isRemovedHomeOwner(item)"
+                          class="ma-0 pl-3"
+                          vertical
+                        />
+                      </v-btn>
+
+                      <v-menu
+                        v-if="isChangedOwner(item) && (isDisabledForSJTChanges(item) || isDisabledForWillChanges(item))"
+                        location="bottom right"
+                      >
+                        <template #activator="{ props }">
+                          <v-btn
+                            variant="plain"
+                            color="primary"
+                            class="menu-drop-down-btn mr-n4"
+                            :disabled="isAddingMode || isGlobalEditingMode || isDisabledForSJTChanges(item)"
+                            v-bind="props"
+                          >
+                            <v-icon>mdi-menu-down</v-icon>
+                          </v-btn>
+                        </template>
+
+                        <!-- More actions drop down list -->
+                        <v-list class="actions-dropdown actions__more-actions">
+                          <!-- Menu Edit Option -->
+                          <v-list-item
+                            class="my-n2"
+                            @click="openForEditing(homeOwners.indexOf(item))"
+                          >
+                            <v-list-item-subtitle class="pa-0">
+                              <v-icon
+                                size="small"
+                                class="mb-1"
+                              >
+                                mdi-pencil
+                              </v-icon>
+                              <span class="ml-1 remove-btn-text">Change Details</span>
+                            </v-list-item-subtitle>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
+                    </template>
 
                     <!-- Change Details when other actions are disabled -->
                     <v-btn
@@ -526,8 +563,66 @@
                     </template>
                   </template>
                   <template v-else-if="!!getMhrTransferType?.transferType">
+                    <template v-if="isRemovedHomeOwner(item) || isChangedOwner(item)">
+                      <v-btn
+                        variant="plain"
+                        color="primary"
+                        class="mx-0 px-0"
+                        :ripple="false"
+                        :disabled="isAddingMode || isEditingMode || isGlobalEditingMode"
+                        data-test-id="table-undo-btn"
+                        @click="undo(item)"
+                      >
+                        <v-icon size="small">
+                          mdi-undo
+                        </v-icon>
+                        <span>Undo</span>
+                        <v-divider
+                          v-if="enableTransferOwnerMenuActions(item) && !isRemovedHomeOwner(item)"
+                          class="ma-0 pl-3"
+                          vertical
+                        />
+                      </v-btn>
+
+                      <v-menu
+                        v-if="isChangedOwner(item)"
+                        location="bottom right"
+                      >
+                        <template #activator="{ props }">
+                          <v-btn
+                            variant="plain"
+                            color="primary"
+                            class="menu-drop-down-btn mr-n4"
+                            :disabled="isAddingMode || isGlobalEditingMode"
+                            v-bind="props"
+                          >
+                            <v-icon>mdi-menu-down</v-icon>
+                          </v-btn>
+                        </template>
+
+                        <!-- More actions drop down list -->
+                        <v-list class="actions-dropdown actions__more-actions">
+                          <!-- Menu Edit Option -->
+                          <v-list-item
+                            class="my-n2"
+                            @click="openForEditing(homeOwners.indexOf(item))"
+                          >
+                            <v-list-item-subtitle class="pa-0">
+                              <v-icon
+                                size="small"
+                                class="mb-1"
+                              >
+                                mdi-pencil
+                              </v-icon>
+                              <span class="ml-1 remove-btn-text">Change Details</span>
+                            </v-list-item-subtitle>
+                          </v-list-item>
+                        </v-list>
+                      </v-menu>
+                    </template>
                     <!-- Change Details when other actions are disabled -->
                     <v-btn
+                      v-else
                       variant="plain"
                       color="primary"
                       class="mx-0 px-0"
diff --git a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
index 0c7b09d7b..2bcd5adb7 100644
--- a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
+++ b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
@@ -501,7 +501,8 @@ export const useMhrInformation = () => {
           }),
           // Determine group tenancy type
           type: (ownerGroup.owners.filter(owner => owner.action === ActionTypes.REMOVED).length > 1 ||
-                getMhrTransferType.value?.transferType === ApiTransferTypes.SURVIVING_JOINT_TENANT)
+                (getMhrTransferType.value?.transferType === ApiTransferTypes.SURVIVING_JOINT_TENANT &&
+                  !ownerGroup.owners.some(owner => owner.action === ActionTypes.CHANGED)))
                 ? isTransferToExecOrAdmin.value
                   ? ApiHomeTenancyTypes.NA
                   : ApiHomeTenancyTypes.JOINT