diff --git a/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte b/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
index a2d1e1b8..71a8665c 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/presenter/ae_comp__event_presenter_obj_li.svelte
@@ -249,55 +249,44 @@ let ae_tmp: key_val = $state({});
                         <button
                             type="button"
                             disabled={!$ae_loc.trusted_access &&
-                                !events_auth_loc.current.auth__kv.presenter[
-                                    event_presenter_obj.event_presenter_id
-                                ]}
+                                !events_auth_loc.current.auth__kv.presenter[event_presenter_obj.event_presenter_id] &&
+                                !events_auth_loc.current.auth__kv.presenter[event_presenter_obj.email ?? ''] &&
+                                !(events_auth_loc.current.auth__person.id && events_auth_loc.current.auth__person.id === event_presenter_obj.person_id)}
                             onclick={() => {
                                 console.log('View terms and conditions');
                                 $events_slct.event_presentation_id =
                                     event_presenter_obj.event_presentation_id;
-                                // $events_slct.event_presentation_obj = $lq__event_presentation_obj;
-
                                 $events_slct.event_presenter_id =
                                     event_presenter_obj.event_presenter_id;
-                                // $events_slct.event_presenter_obj = event_presenter_obj;
-
                                 $events_sess.pres_mgmt.show_modal__presenter_agree =
                                     event_presenter_obj.event_presenter_id;
                             }}
                             class="btn preset-tonal-success hover:preset-filled-success-500 my-0.5"
                             class:btn-sm={display_mode != 'default'}
                             title="Agreed to terms and conditions">
-                            <Check size="1em" class="px-1 text-green-500" />
+                            <Check size="1em" class="mr-1" />
                             Agreed
                         </button>
                     {:else}
                         <button
                             type="button"
                             disabled={!$ae_loc.trusted_access &&
-                                !events_auth_loc.current.auth__kv.presenter[
-                                    event_presenter_obj.event_presenter_id
-                                ]}
+                                !events_auth_loc.current.auth__kv.presenter[event_presenter_obj.event_presenter_id] &&
+                                !events_auth_loc.current.auth__kv.presenter[event_presenter_obj.email ?? ''] &&
+                                !(events_auth_loc.current.auth__person.id && events_auth_loc.current.auth__person.id === event_presenter_obj.person_id)}
                             onclick={() => {
                                 console.log('View terms and conditions');
-
                                 $events_slct.event_presentation_id =
                                     event_presenter_obj.event_presentation_id;
-                                // $events_slct.event_presentation_obj = $lq__event_presentation_obj;
-
                                 $events_slct.event_presenter_id =
                                     event_presenter_obj.event_presenter_id;
-                                // $events_slct.event_presenter_obj = event_presenter_obj;
-
                                 $events_sess.pres_mgmt.show_modal__presenter_agree =
                                     event_presenter_obj.event_presenter_id;
                             }}
                             class="btn preset-tonal-warning border-warning-500 hover:preset-filled-warning-500 my-0.5 border"
                             class:btn-sm={display_mode != 'default'}
                             title="View terms and conditions">
-                            <X
-                                size="1em"
-                                class="mx-1 bg-red-500 px-1 text-white" />
+                            <X size="1em" class="mr-1" />
                             Not yet agreed
                         </button>
                     {/if}
diff --git a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
index 665e2064..a2d09fe3 100644
--- a/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/(pres_mgmt)/session/[session_id]/session_view.svelte
@@ -36,6 +36,7 @@ import { db_events } from '$lib/ae_events/db_events';
 import Comp_event_session_poc_profile from './ae_comp__event_session_poc_profile.svelte';
 import Comp_event_session_poc_form_agree from './ae_comp__event_session_poc_form_agree.svelte';
 import {
+    Check,
     ChevronDown,
     ChevronUp,
     Clock,
@@ -45,7 +46,8 @@ import {
     MapPin,
     Pencil,
     RefreshCw,
-    Unlink
+    Unlink,
+    X
 } from '@lucide/svelte';
 
 if (!$events_sess.pres_mgmt) {
@@ -512,9 +514,9 @@ async function send_poc_email_link() {
                                         onclick={() =>
                                             ($events_sess.pres_mgmt.show_modal__session_poc_agree = true)}>
                                         {#if $lq__event_session_obj?.poc_agree}
-                                            <span class="mr-1 text-green-500">✓</span> Agreed
+                                            <Check size="1em" class="mr-1" /> Agreed
                                         {:else}
-                                            <span class="mr-1 text-red-500">✗</span> Not yet agreed
+                                            <X size="1em" class="mr-1" /> Not yet agreed
                                         {/if}
                                     </button>