diff --git a/modules/helpdesk/pages/helpdesk/handovers/_form.phtml b/modules/helpdesk/pages/helpdesk/handovers/_form.phtml
index 2ebf466..d55f69a 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/_form.phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/_form.phtml
@@ -11,6 +11,7 @@
 $schemaFields = is_array($schemaFields ?? null) ? $schemaFields : [];
 $fieldValues = is_array($fieldValues ?? null) ? $fieldValues : [];
 $fieldDiff = is_array($fieldDiff ?? null) ? $fieldDiff : [];
+$tenantUsers = is_array($tenantUsers ?? null) ? $tenantUsers : [];
 $readonly = !empty($readonly);
 $hasDiff = $fieldDiff !== [];
 ?>
@@ -56,6 +57,35 @@ $hasDiff = $fieldDiff !== [];
         <?php endif; ?>
       </div>
 
+    <?php elseif ($type === 'user-select'): ?>
+      <div class="handover-diff-field<?php e($diffClass); ?>">
+        <label for="<?php e($inputId); ?>">
+          <?php e($label); ?>
+          <?php if ($required): ?><span class="handover-form-required"> *</span><?php endif; ?>
+        </label>
+        <select
+          id="<?php e($inputId); ?>"
+          name="field_<?php e($key); ?>"
+          <?php if ($required): ?> aria-required="true"<?php endif; ?>
+          <?php if ($readonly): ?> disabled<?php endif; ?>
+        >
+          <option value=""><?php e(t('Please select...')); ?></option>
+          <?php foreach ($tenantUsers as $u):
+              $uId = (string) ($u['id'] ?? '');
+              $uName = trim((string) ($u['display_name'] ?? ''));
+              $uEmail = (string) ($u['email'] ?? '');
+              $uLabel = $uName !== '' ? $uName : $uEmail;
+          ?>
+            <option value="<?php e($uId); ?>"<?php if ($value === $uId): ?> selected<?php endif; ?>>
+              <?php e($uLabel); ?>
+            </option>
+          <?php endforeach; ?>
+        </select>
+        <?php if ($diff !== null && $diff['type'] === 'changed'): ?>
+          <small class="app-muted handover-diff-indicator" aria-label="<?php e(t('Changed')); ?>"><?php e(t('was: %s', (string) ($diff['old'] ?? ''))); ?></small>
+        <?php endif; ?>
+      </div>
+
     <?php elseif ($type === 'select'): ?>
       <div class="handover-diff-field<?php e($diffClass); ?>">
         <label for="<?php e($inputId); ?>">
diff --git a/modules/helpdesk/pages/helpdesk/handovers/create().php b/modules/helpdesk/pages/helpdesk/handovers/create().php
index a76eed1..c315acd 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/create().php
+++ b/modules/helpdesk/pages/helpdesk/handovers/create().php
@@ -230,6 +230,21 @@ if ($step === $protocolStep) {
         ? $product['name']
         : (string) ($product['bc_description'] ?? $wizardData['product_code']);
 
+    // Load tenant users for user-select schema fields
+    $hasUserSelectField = !empty(array_filter($schemaFields, fn($f) => ($f['type'] ?? '') === 'user-select'));
+    $tenantUsers = [];
+    if ($hasUserSelectField) {
+        $rows = DB::select(
+            'SELECT u.id, u.display_name, u.email'
+            . ' FROM users u'
+            . ' JOIN user_tenants ut ON ut.user_id = u.id'
+            . ' WHERE ut.tenant_id = ? AND u.active = 1'
+            . ' ORDER BY u.display_name ASC',
+            (string) $currentTenantId
+        );
+        $tenantUsers = is_array($rows) ? $rows : [];
+    }
+
     if ($request->isMethod('POST')) {
         if (!Session::checkCsrfToken()) {
             $modeParam = $canManage ? '&mode=' . ($wizardData['mode'] ?? 'self') : '';
diff --git a/modules/helpdesk/pages/helpdesk/handovers/edit($id).php b/modules/helpdesk/pages/helpdesk/handovers/edit($id).php
index 60ea2ce..8bbda1a 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/edit($id).php
+++ b/modules/helpdesk/pages/helpdesk/handovers/edit($id).php
@@ -1,6 +1,7 @@
 <?php
 
 use MintyPHP\Buffer;
+use MintyPHP\DB;
 use MintyPHP\Http\SessionStoreInterface;
 use MintyPHP\Module\Helpdesk\HelpdeskAuthorizationPolicy;
 use MintyPHP\Module\Helpdesk\Service\HandoverRevisionService;
@@ -201,6 +202,21 @@ if ($request->isMethod('POST') && $canEdit) {
 $validationSummaryErrors = $errorBag->toArray();
 $errors = $errorBag->toFlatList();
 
+// Load tenant users for user-select schema fields
+$hasUserSelectField = !empty(array_filter($schemaFields, fn($f) => ($f['type'] ?? '') === 'user-select'));
+$tenantUsers = [];
+if ($hasUserSelectField) {
+    $rows = DB::select(
+        'SELECT u.id, u.display_name, u.email'
+        . ' FROM users u'
+        . ' JOIN user_tenants ut ON ut.user_id = u.id'
+        . ' WHERE ut.tenant_id = ? AND u.active = 1'
+        . ' ORDER BY u.display_name ASC',
+        (string) $tenantId
+    );
+    $tenantUsers = is_array($rows) ? $rows : [];
+}
+
 // Load revision data
 $revisions = $revisionService->listByHandover($tenantId, $handoverId);
 $activeRevisionNumber = (int) $request->query('revision', 0);