diff --git a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
index 499c5043..19daf79b 100644
--- a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
+++ b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte
@@ -125,7 +125,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
                 api_cfg={$ae_api}
 
                 object_type={'event_location'}
-                object_id={event_location_obj?.event_location_id_random}
+                object_id={event_location_obj?.event_location_id}
                 object_reload={true}
 
                 field_name={'name'}
@@ -171,7 +171,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
                 </a>
 
                 <a
-                    href="/event/{event_location_obj?.event_id}/launcher/{event_location_obj?.event_location_id_random}"
+                    href="/event/{event_location_obj?.event_id}/launcher/{event_location_obj?.event_location_id}"
                     class="btn btn-sm preset-tonal-secondary hover:preset-filled-secondary-500 transition-all hover:transition-all *:hover:inline text-xs"
                     title="The legacy launcher that not actively being developed. Use with the native launcher for oral sessions."
                     >
@@ -180,7 +180,7 @@ if (!$events_loc.pres_mgmt?.location_kv) {
                 </a>
 
                 <a
-                    href="/events/{event_location_obj?.event_id}/launcher/{event_location_obj?.event_location_id_random}"
+                    href="/events/{event_location_obj?.event_id}/launcher/{event_location_obj?.event_location_id}"
                     class="btn btn-sm preset-tonal-tertiary border border-tertiary-500 hover:preset-filled-secondary-500 transition-all hover:transition-all *:hover:inline text-xs"
                     title="The new launcher that is actively being developed. Do not use with the native launcher."
                     >
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
index e993fc7e..07c06e13 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
@@ -390,7 +390,7 @@ let clipboard_success = $state(false);
             href="/event/{$lq__event_session_obj?.event_id}/launcher/{$lq__event_session_obj?.event_location_id}"
             class:hidden={$events_loc.pres_mgmt?.hide__launcher_link_legacy && !($ae_loc.trusted_access && $ae_loc.edit_mode)}
             class="btn btn-sm preset-tonal-secondary hover:preset-filled-secondary-500 transition-all"
-            title={`Legacy Launcher (Flask): ${$lq__event_session_obj?.event_location_name}\n${$lq__event_session_obj?.event_location_id_random}`}
+            title={`Legacy Launcher (Flask): ${$lq__event_session_obj?.event_location_name}\n${$lq__event_session_obj?.event_location_id}`}
             >
             <span class="fas fa-paper-plane m-1"></span>
             {@html $lq__event_session_obj?.event_location_name ? $lq__event_session_obj?.event_location_name : ae_snip.html__not_set}
@@ -403,7 +403,7 @@ let clipboard_success = $state(false);
             href="/events/{$lq__event_session_obj?.event_id}/launcher/{$lq__event_session_obj?.event_location_id}?session_id={$lq__event_session_obj?.event_session_id}"
             class:hidden={$events_loc.pres_mgmt?.hide__launcher_link && !($ae_loc.trusted_access && $ae_loc.edit_mode)}
             class="btn btn-sm preset-tonal-tertiary hover:preset-filled-secondary-500 group transition-all"
-            title={`Launcher (Svelte): ${$lq__event_session_obj?.event_location_name}\n${$lq__event_session_obj?.event_location_id_random}`}
+            title={`Launcher (Svelte): ${$lq__event_session_obj?.event_location_name}\n${$lq__event_session_obj?.event_location_id}`}
             >
             <span class="fas fa-plane"></span>
             <span class="hidden group-hover:inline">
@@ -416,7 +416,7 @@ let clipboard_success = $state(false);
             href="/events/{$lq__event_session_obj?.event_id}/location/{$lq__event_session_obj?.event_location_id}"
             class:hidden={$events_loc.pres_mgmt?.hide__location_link && !($ae_loc.trusted_access && $ae_loc.edit_mode)}
             class="btn btn-sm preset-tonal-surface hover:preset-filled-tertiary-500 group transition-all"
-            title={`Location Details: ${$lq__event_session_obj?.event_location_name}\n${$lq__event_session_obj?.event_location_id_random}`}
+            title={`Location Details: ${$lq__event_session_obj?.event_location_name}\n${$lq__event_session_obj?.event_location_id}`}
             >
             <span class="fas fa-map-marker-alt m-1"></span>
             <span class="hidden group-hover:inline">