diff --git a/app/javascript/constants/strings.js b/app/javascript/constants/strings.js
index c008c8699..e28077154 100644
--- a/app/javascript/constants/strings.js
+++ b/app/javascript/constants/strings.js
@@ -2,7 +2,6 @@ const twoLines = (line1, line2) => (h) =>  h('p', {}, [line1, h('br'), line2]);
 const errorMessage = (message) => (errorCode) => twoLines(message, `Error code: ${errorCode}`);
 const titleCase = (model) => `${model.substring(0, 1).toUpperCase()}${model.substring(1)}`;
 const nLines = (lines) => (h) => h('p', {}, lines.reduce((p, c) => [...p, c, h('br')], []));
-const bold = (text) => (h) => h('strong', {}, text);
 
 module.exports = {
     // login page
@@ -371,5 +370,4 @@ module.exports = {
     REG_ID_NOT_FOUND: "No results found. Please check your input.",
     REG_ID_UNLINK_BUTTON: "Unlink Current Registration",
     REG_ID_UNLINK_CONFIRMATION_TITLE: "",
-    REG_ID_UNLINK_CONFIRMATION_TEXT: (name, number) => `This will unlink ${name} from Ticket Number ${number}.`,
 }
diff --git a/app/javascript/people/people_admin_tab.vue b/app/javascript/people/people_admin_tab.vue
index 5116a33f9..fd787db52 100644
--- a/app/javascript/people/people_admin_tab.vue
+++ b/app/javascript/people/people_admin_tab.vue
@@ -12,16 +12,15 @@
           nullText="Unknown"
         >
           <template #registration_number-val-end>
-            <edit-button v-if="currentUserIsAdmin" v-b-modal.edit-reg-number id="reg-number-edit-button"></edit-button>
+            <edit-button :disabled="!currentUserIsAdmin" v-b-modal.edit-reg-number id="reg-number-edit-button"></edit-button>
             <icon-button
               modal="unlink-confirmation"
-              :disabled="!selected.registration_number"
+              :disabled="!selected.registration_number || !currentUserIsAdmin"
               :tooltip="REG_ID_UNLINK_BUTTON"
-              disabledTooltip="No Ticket Number to unlink"
+              disabledTooltip="You are not an Admin or there is No Ticket Number to unlink"
               background="none"
               variant="danger"
               icon="trash-fill"
-              v-if="currentUserIsAdmin"
             ></icon-button>
           </template>
         </dl-person>
@@ -54,7 +53,7 @@
       @ok="unlinkPerson()"
       :title="REG_ID_UNLINK_CONFIRMATION_TITLE"
     >
-      {{ REG_ID_UNLINK_CONFIRMATION_TEXT(selected.published_name, selected.registration_number) }}
+      This will unlink <strong>{{ selected.published_name }}</strong> from Ticket Number {{selected.registration_number}}.
     </plano-modal>
   </div>
 </template>
@@ -75,7 +74,6 @@ import {
   PERSON_UNLINK_SUCCESS,
   PERSON_UNLINK_FAILURE,
   REG_ID_UNLINK_CONFIRMATION_TITLE,
-  REG_ID_UNLINK_CONFIRMATION_TEXT,
   REG_ID_UNLINK_BUTTON,
 } from "@/constants/strings";
 import { mapActions } from "vuex";
@@ -103,7 +101,6 @@ export default {
     model,
     PERSON_CON_STATE,
     REG_ID_UNLINK_CONFIRMATION_TITLE,
-    REG_ID_UNLINK_CONFIRMATION_TEXT,
     REG_ID_UNLINK_BUTTON,
   }),
   computed: {
diff --git a/app/javascript/people/person-edit-reg-number.vue b/app/javascript/people/person-edit-reg-number.vue
index 3c1d7b94a..c721bdb29 100644
--- a/app/javascript/people/person-edit-reg-number.vue
+++ b/app/javascript/people/person-edit-reg-number.vue
@@ -54,7 +54,7 @@
         </div>
       </div>
     </edit-modal>
-    <plano-modal id="unmatch-match">This will unlink {{ matchedPerson }} from ticket number {{ selectedRegNumber }}, and link to the current profile.
+    <plano-modal id="unmatch-match">This will unlink <strong>{{ matchedPerson }}</strong> from ticket number {{ selectedRegNumber }}, and link to the current profile.
       <template #modal-footer="{ok, cancel}">
         <b-button variant="link" @click="cancel()">Cancel</b-button>
         <spinner-button variant="danger" :loading="unlinkLinkLoading" @click="unlinkLink(ok)">Ok</spinner-button>