diff --git a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
index c8a5f151..cfbfc28f 100644
--- a/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
+++ b/src/routes/events/[event_id]/(badges)/badges/ae_comp__badge_obj_li.svelte
@@ -175,11 +175,11 @@ let visible_badge_obj_li = $derived(
                                     {/if}
 
                                     <div class="flex flex-col sm:flex-row sm:items-center gap-1 sm:gap-3 min-w-0">
-                                        <span class="truncate font-semibold min-w-44">{display_name}</span>
+                                        <span class="truncate font-semibold min-w-44 max-w-64">{display_name}</span>
 
                                         {#if show_sensitive_fields && event_badge_obj?.email}
 
-                                            <span class="text-surface-600-400 bg-surface-100-900 rounded px-1.5 py-0.5 font-mono text-sm select-all hover:bg-surface-100-900 truncate min-w-52">
+                                            <span class="text-surface-600-400 bg-surface-100-900 rounded px-1.5 py-0.5 font-mono text-sm select-all hover:bg-surface-100-900 truncate min-w-52 max-w-64">
                                                 {is_trusted
                                                     ? event_badge_obj.email
                                                     : obscure_email(event_badge_obj.email)}
@@ -188,7 +188,7 @@ let visible_badge_obj_li = $derived(
 
                                         {#if !hide_affiliations && (event_badge_obj?.affiliations_override ?? event_badge_obj?.affiliations)}
 
-                                            <span class="text-surface-600-400 bg-surface-100-900 rounded px-1.5 py-0.5 font-mono text-sm italic select-all hover:bg-surface-100-900 truncate min-w-52">
+                                            <span class="text-surface-600-400 bg-surface-100-900 rounded px-1.5 py-0.5 font-mono text-sm italic select-all hover:bg-surface-100-900 truncate min-w-52 max-w-64">
                                                 {event_badge_obj.affiliations_override ?? event_badge_obj.affiliations}
                                             </span>
                                         {/if}
@@ -227,9 +227,15 @@ let visible_badge_obj_li = $derived(
                             <!-- Badge type chip -->
                             {#if !hide_badge_type && event_badge_obj?.badge_type}
                                 <span
-                                    class="text-primary-500 bg-primary-500/10 rounded-token flex items-center gap-1 px-2 text-xs italic">
+                                    class="text-primary-500 bg-primary-500/10 rounded-token flex items-center gap-1 px-2 text-xs italic"
+                                    title="Badge type: {event_badge_obj?.badge_type_code} - {event_badge_obj?.badge_type}"
+                                    >
                                     <Tags size="1em" />
+                                    {#if $ae_loc.trusted_access}
+                                    {event_badge_obj.badge_type_code}
+                                    {:else}
                                     {event_badge_obj.badge_type}
+                                    {/if}
                                 </span>
                             {/if}
                         </div>