diff --git a/modules/helpdesk/pages/helpdesk/handovers/assign(default).phtml b/modules/helpdesk/pages/helpdesk/handovers/assign(default).phtml
index ce3e282..ba29240 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/assign(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/assign(default).phtml
@@ -48,9 +48,13 @@ $currentStatus = (string) ($handover['status'] ?? '');
           <?php if (!empty($errors['assigned_to'])): ?>aria-describedby="assigned_to_error"<?php endif; ?>
         >
           <option value=""><?php e(t('— Select employee —')); ?></option>
-          <?php foreach ($tenantUsers as $u): ?>
-            <option value="<?php e($u['id']); ?>"<?php if ((int) $u['id'] === $currentAssignedTo): ?> selected<?php endif; ?>>
-              <?php e($u['display_name'] ?: $u['email']); ?>
+          <?php foreach ($tenantUsers as $u):
+              $uId = (int) ($u['u']['id'] ?? $u['id'] ?? 0);
+              $uName = (string) ($u['u']['display_name'] ?? $u['display_name'] ?? '');
+              $uEmail = (string) ($u['u']['email'] ?? $u['email'] ?? '');
+          ?>
+            <option value="<?php e($uId); ?>"<?php if ($uId === $currentAssignedTo): ?> selected<?php endif; ?>>
+              <?php e($uName ?: $uEmail); ?>
             </option>
           <?php endforeach; ?>
         </select>
diff --git a/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml b/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml
index 8b560ab..3feb6bd 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/create(default).phtml
@@ -117,9 +117,13 @@ $tenantUsers = is_array($tenantUsers ?? null) ? $tenantUsers : [];
           <label for="wizard-assigned-to"><?php e(t('Assign to (optional)')); ?></label>
           <select id="wizard-assigned-to" name="assigned_to">
             <option value="0"><?php e(t('— Not assigned yet —')); ?></option>
-            <?php foreach ($tenantUsers as $u): ?>
-              <option value="<?php e($u['id']); ?>"<?php if ((int) ($form['assigned_to'] ?? 0) === (int) $u['id']): ?> selected<?php endif; ?>>
-                <?php e($u['display_name'] ?: $u['email']); ?>
+            <?php foreach ($tenantUsers as $u):
+                $uId = (int) ($u['u']['id'] ?? $u['id'] ?? 0);
+                $uName = (string) ($u['u']['display_name'] ?? $u['display_name'] ?? '');
+                $uEmail = (string) ($u['u']['email'] ?? $u['email'] ?? '');
+            ?>
+              <option value="<?php e($uId); ?>"<?php if ((int) ($form['assigned_to'] ?? 0) === $uId): ?> selected<?php endif; ?>>
+                <?php e($uName ?: $uEmail); ?>
               </option>
             <?php endforeach; ?>
           </select>