diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
index 3745f5ea..03e19c0f 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/[presenter_id]/presenter_view.svelte
@@ -850,7 +850,11 @@ $effect(() => {
                         {/if}
 
                         {#if $ae_loc.trusted_access && $ae_loc.edit_mode && (!$lq__event_presenter_obj.person_id || $ae_loc.administrator_access)}
-                            <!-- Load person list before using the editor's built-in select -->
+                            <!-- Load person list before using the editor's built-in select.
+                                 WHY: Re-linking is intentionally admin-only when a person is already
+                                 assigned. Staff were creating duplicate person records when they made
+                                 mistakes on the initial link. The "Add Person" button below serves as
+                                 the safety net for the first-time case (no person linked yet). -->
                             <button
                                 type="button"
                                 onclick={async () => {
@@ -862,8 +866,7 @@ $effect(() => {
                                             api_cfg: $ae_api,
                                             for_obj_type: 'account',
                                             for_obj_id: $slct.account_id,
-                                            limit: $ae_loc.person
-                                                .qry_limit__people,
+                                            limit: 1000, // We need to keep this limit high to show all people for selection: $ae_loc.person.qry_limit__people
                                             order_by_li: {
                                                 family_name: 'ASC',
                                                 given_name: 'ASC',
@@ -970,7 +973,7 @@ $effect(() => {
                             if ($ae_loc.administrator_access) {
                                 if (
                                     !confirm(
-                                        `Add a new person (${$lq__event_presenter_obj.person_given_name}) to the account? You will be able to edit their details after the person record is created.\n\n${$ae_loc.account_name}\nID: ${$slct.account_id}`
+                                        `Add a new person (${$lq__event_presenter_obj.given_name}) to the account? You will be able to edit their details after the person record is created.\n\n${$ae_loc.account_name}\nID: ${$slct.account_id}`
                                     )
                                 ) {
                                     return;
@@ -978,7 +981,7 @@ $effect(() => {
                             } else {
                                 if (
                                     !confirm(
-                                        `Add a new person (${$lq__event_presenter_obj.person_given_name}) to the account based on this presenter? Be sure to check if there is an existing person record first.\n\n${$ae_loc.account_name}\nID: ${$slct.account_id}`
+                                        `Add a new person (${$lq__event_presenter_obj.given_name}) to the account based on this presenter? Be sure to check if there is an existing person record first.\n\n${$ae_loc.account_name}\nID: ${$slct.account_id}`
                                     )
                                 ) {
                                     return;
@@ -1029,6 +1032,8 @@ $effect(() => {
                             if (new_person_obj) {
                                 events_func.update_ae_obj__event_presenter({
                                     api_cfg: $ae_api,
+                                    event_presentation_id:
+                                        $lq__event_presenter_obj?.event_presentation_id,
                                     event_presenter_id:
                                         $lq__event_presenter_obj?.event_presenter_id,
                                     data_kv: {
@@ -1201,6 +1206,8 @@ $effect(() => {
                                 events_func
                                     .update_ae_obj__event_presenter({
                                         api_cfg: $ae_api,
+                                        event_presentation_id:
+                                            $lq__event_presenter_obj?.event_presentation_id,
                                         event_presenter_id:
                                             $lq__event_presenter_obj?.event_presenter_id,
                                         data_kv: event_presenter_data,