diff --git a/pages/admin/users/_form.phtml b/pages/admin/users/_form.phtml
index 77755df..9812709 100644
--- a/pages/admin/users/_form.phtml
+++ b/pages/admin/users/_form.phtml
@@ -312,54 +312,64 @@ foreach ($tenants as $tenant) {
         <details name="security-password-resets" data-details-key="security-password-resets">
           <summary><?php e(t('Password resets')); ?></summary>
           <hr>
-          <div class="overflow-auto white-space-nowrap">
-            <table>
-              <thead>
-                <tr>
-                  <th><?php e(t('Requested at')); ?></th>
-                  <th><?php e(t('Expires at')); ?></th>
-                  <th><?php e(t('Used at')); ?></th>
-                  <th><?php e(t('Attempts')); ?></th>
-                  <th><?php e(t('Status')); ?></th>
-                </tr>
-              </thead>
-              <tbody>
-                <?php foreach ($passwordResets as $reset): ?>
-                  <?php
-                  $expiresAt = (string) ($reset['expires_at'] ?? '');
-                  $usedAt = (string) ($reset['used_at'] ?? '');
-                  $status = t('Active');
-                  $statusVariant = 'success';
-                  if ($usedAt !== '') {
-                    $status = t('Used');
-                    $statusVariant = 'neutral';
-                  } elseif ($expiresAt !== '') {
-                    try {
-                      $expired = (new \DateTimeImmutable($expiresAt)) <= new \DateTimeImmutable('now');
-                      if ($expired) {
-                        $status = t('Expired');
-                        $statusVariant = 'warning';
-                      }
-                    } catch (\Exception $e) {
-                      // fallback: keep Active
-                    }
-                  }
-                  ?>
+          <?php if (!$passwordResets): ?>
+            <?php
+            $emptyState = [
+              'message' => t('No entries found'),
+              'size' => 'compact',
+            ];
+            require templatePath('partials/app-empty-state.phtml');
+            ?>
+          <?php else: ?>
+            <div class="overflow-auto white-space-nowrap">
+              <table>
+                <thead>
                   <tr>
-                    <td><?php e(dt($reset['created'] ?? '')); ?></td>
-                    <td><?php e($expiresAt !== '' ? dt($expiresAt) : '-'); ?></td>
-                    <td><?php e($usedAt !== '' ? dt($usedAt) : '-'); ?></td>
-                    <td><?php e((string) ($reset['attempts'] ?? 0)); ?></td>
-                    <td>
-                      <span class="badge" data-variant="<?php e($statusVariant); ?>">
-                        <?php e($status); ?>
-                      </span>
-                    </td>
+                    <th><?php e(t('Requested at')); ?></th>
+                    <th><?php e(t('Expires at')); ?></th>
+                    <th><?php e(t('Used at')); ?></th>
+                    <th><?php e(t('Attempts')); ?></th>
+                    <th><?php e(t('Status')); ?></th>
                   </tr>
-                <?php endforeach; ?>
-              </tbody>
-            </table>
-          </div>
+                </thead>
+                <tbody>
+                  <?php foreach ($passwordResets as $reset): ?>
+                    <?php
+                    $expiresAt = (string) ($reset['expires_at'] ?? '');
+                    $usedAt = (string) ($reset['used_at'] ?? '');
+                    $status = t('Active');
+                    $statusVariant = 'success';
+                    if ($usedAt !== '') {
+                      $status = t('Used');
+                      $statusVariant = 'neutral';
+                    } elseif ($expiresAt !== '') {
+                      try {
+                        $expired = (new \DateTimeImmutable($expiresAt)) <= new \DateTimeImmutable('now');
+                        if ($expired) {
+                          $status = t('Expired');
+                          $statusVariant = 'warning';
+                        }
+                      } catch (\Exception $e) {
+                        // fallback: keep Active
+                      }
+                    }
+                    ?>
+                    <tr>
+                      <td><?php e(dt($reset['created'] ?? '')); ?></td>
+                      <td><?php e($expiresAt !== '' ? dt($expiresAt) : '-'); ?></td>
+                      <td><?php e($usedAt !== '' ? dt($usedAt) : '-'); ?></td>
+                      <td><?php e((string) ($reset['attempts'] ?? 0)); ?></td>
+                      <td>
+                        <span class="badge" data-variant="<?php e($statusVariant); ?>">
+                          <?php e($status); ?>
+                        </span>
+                      </td>
+                    </tr>
+                  <?php endforeach; ?>
+                </tbody>
+              </table>
+            </div>
+          <?php endif; ?>
         </details>
       <?php endif; ?>
       <?php if ($showRememberTokens): ?>
@@ -367,55 +377,65 @@ foreach ($tenants as $tenant) {
         <details name="security-login-tokens" data-details-key="security-login-tokens">
           <summary><?php e(t('Login tokens')); ?></summary>
           <hr>
-          <div class="overflow-auto white-space-nowrap">
-            <table>
-              <thead>
-                <tr>
-                  <th><?php e(t('Created at')); ?></th>
-                  <th><?php e(t('Expires at')); ?></th>
-                  <th><?php e(t('Last used')); ?></th>
-                  <th><?php e(t('Status')); ?></th>
-                </tr>
-              </thead>
-              <tbody>
-                <?php foreach ($rememberTokens as $token): ?>
-                  <?php
-                  $expiresAt = (string) ($token['expires_at'] ?? '');
-                  $expiredByAdminAt = (string) ($token['expired_by_admin_at'] ?? '');
-                  $lastUsed = (string) ($token['last_used'] ?? '');
-                  $status = t('Active');
-                  $statusVariant = 'success';
-                  if ($expiresAt !== '') {
-                    try {
-                      $expired = (new \DateTimeImmutable($expiresAt)) <= new \DateTimeImmutable('now');
-                      if ($expired) {
-                        if ($expiredByAdminAt !== '') {
-                          $status = t('Expired by admin');
-                          $statusVariant = 'warning';
-                        } else {
-                          $status = t('Expired');
-                          $statusVariant = 'warning';
-                        }
-                      }
-                    } catch (\Exception $e) {
-                      // fallback: keep Active
-                    }
-                  }
-                  ?>
+          <?php if (!$rememberTokens): ?>
+            <?php
+            $emptyState = [
+              'message' => t('No entries found'),
+              'size' => 'compact',
+            ];
+            require templatePath('partials/app-empty-state.phtml');
+            ?>
+          <?php else: ?>
+            <div class="overflow-auto white-space-nowrap">
+              <table>
+                <thead>
                   <tr>
-                    <td><?php e(dt($token['created'] ?? '')); ?></td>
-                    <td><?php e($expiresAt !== '' ? dt($expiresAt) : '-'); ?></td>
-                    <td><?php e($lastUsed !== '' ? dt($lastUsed) : '-'); ?></td>
-                    <td>
-                      <span class="badge" data-variant="<?php e($statusVariant); ?>">
-                        <?php e($status); ?>
-                      </span>
-                    </td>
+                    <th><?php e(t('Created at')); ?></th>
+                    <th><?php e(t('Expires at')); ?></th>
+                    <th><?php e(t('Last used')); ?></th>
+                    <th><?php e(t('Status')); ?></th>
                   </tr>
-                <?php endforeach; ?>
-              </tbody>
-            </table>
-          </div>
+                </thead>
+                <tbody>
+                  <?php foreach ($rememberTokens as $token): ?>
+                    <?php
+                    $expiresAt = (string) ($token['expires_at'] ?? '');
+                    $expiredByAdminAt = (string) ($token['expired_by_admin_at'] ?? '');
+                    $lastUsed = (string) ($token['last_used'] ?? '');
+                    $status = t('Active');
+                    $statusVariant = 'success';
+                    if ($expiresAt !== '') {
+                      try {
+                        $expired = (new \DateTimeImmutable($expiresAt)) <= new \DateTimeImmutable('now');
+                        if ($expired) {
+                          if ($expiredByAdminAt !== '') {
+                            $status = t('Expired by admin');
+                            $statusVariant = 'warning';
+                          } else {
+                            $status = t('Expired');
+                            $statusVariant = 'warning';
+                          }
+                        }
+                      } catch (\Exception $e) {
+                        // fallback: keep Active
+                      }
+                    }
+                    ?>
+                    <tr>
+                      <td><?php e(dt($token['created'] ?? '')); ?></td>
+                      <td><?php e($expiresAt !== '' ? dt($expiresAt) : '-'); ?></td>
+                      <td><?php e($lastUsed !== '' ? dt($lastUsed) : '-'); ?></td>
+                      <td>
+                        <span class="badge" data-variant="<?php e($statusVariant); ?>">
+                          <?php e($status); ?>
+                        </span>
+                      </td>
+                    </tr>
+                  <?php endforeach; ?>
+                </tbody>
+              </table>
+            </div>
+          <?php endif; ?>
         </details>
       <?php endif; ?>
       <?php if ($showApiTokens): ?>
@@ -590,7 +610,13 @@ foreach ($tenants as $tenant) {
               }
               ?>
               <?php if (!$selectedTenantMap): ?>
-                <p class="muted"><?php e(t('Assign tenants first to select departments')); ?></p>
+                <?php
+                $emptyState = [
+                  'message' => t('Assign tenants first to select departments'),
+                  'size' => 'compact',
+                ];
+                require templatePath('partials/app-empty-state.phtml');
+                ?>
               <?php else: ?>
                 <?php foreach ($selectedTenantMap as $tenantId => $tenant): ?>
                   <?php $tenantDepartments = $departmentOptionsByTenant[$tenantId] ?? []; ?>
@@ -638,47 +664,57 @@ foreach ($tenants as $tenant) {
           <details name="assignments-permissions" data-details-key="assignments-permissions">
             <summary><?php e(t('Permissions')); ?></summary>
             <hr>
-            <div class="overflow-auto white-space-nowrap">
-              <table>
-                <thead>
-                  <tr>
-                    <th><?php e(t('Description')); ?></th>
-                    <th><?php e(t('Permission key')); ?></th>
-                    <th><?php e(t('Permission origin')); ?></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <?php foreach ($permissionRows as $permissionRow): ?>
-                    <?php
-                    $permissionKey = (string) ($permissionRow['key'] ?? '');
-                    $labelKey = 'perm.' . $permissionKey;
-                    $label = t($labelKey);
-                    if ($label === $labelKey) {
-                      $label = (string) ($permissionRow['description'] ?? '');
-                      if ($label === '') {
-                        $label = $permissionKey;
-                      }
-                    }
-                    $rolesList = [];
-                    if (!empty($permissionRow['roles']) && is_array($permissionRow['roles'])) {
-                      $rolesList = $permissionRow['roles'];
-                    }
-                    ?>
+            <?php if (!$permissionRows): ?>
+              <?php
+              $emptyState = [
+                'message' => t('No entries found'),
+                'size' => 'compact',
+              ];
+              require templatePath('partials/app-empty-state.phtml');
+              ?>
+            <?php else: ?>
+              <div class="overflow-auto white-space-nowrap">
+                <table>
+                  <thead>
                     <tr>
-                      <td><?php e($label); ?></td>
-                      <td><code><?php e($permissionKey); ?></code></td>
-                      <td>
-                        <?php if ($rolesList): ?>
-                          <?php foreach ($rolesList as $roleLabel): ?>
-                            <span class="badge" data-variant="neutral"><?php e($roleLabel); ?></span>
-                          <?php endforeach; ?>
-                        <?php endif; ?>
-                      </td>
+                      <th><?php e(t('Description')); ?></th>
+                      <th><?php e(t('Permission key')); ?></th>
+                      <th><?php e(t('Permission origin')); ?></th>
                     </tr>
-                  <?php endforeach; ?>
-                </tbody>
-              </table>
-            </div>
+                  </thead>
+                  <tbody>
+                    <?php foreach ($permissionRows as $permissionRow): ?>
+                      <?php
+                      $permissionKey = (string) ($permissionRow['key'] ?? '');
+                      $labelKey = 'perm.' . $permissionKey;
+                      $label = t($labelKey);
+                      if ($label === $labelKey) {
+                        $label = (string) ($permissionRow['description'] ?? '');
+                        if ($label === '') {
+                          $label = $permissionKey;
+                        }
+                      }
+                      $rolesList = [];
+                      if (!empty($permissionRow['roles']) && is_array($permissionRow['roles'])) {
+                        $rolesList = $permissionRow['roles'];
+                      }
+                      ?>
+                      <tr>
+                        <td><?php e($label); ?></td>
+                        <td><code><?php e($permissionKey); ?></code></td>
+                        <td>
+                          <?php if ($rolesList): ?>
+                            <?php foreach ($rolesList as $roleLabel): ?>
+                              <span class="badge" data-variant="neutral"><?php e($roleLabel); ?></span>
+                            <?php endforeach; ?>
+                          <?php endif; ?>
+                        </td>
+                      </tr>
+                    <?php endforeach; ?>
+                  </tbody>
+                </table>
+              </div>
+            <?php endif; ?>
           </details>
         <?php endif; ?>
       </div>
@@ -687,7 +723,13 @@ foreach ($tenants as $tenant) {
     <?php if ($showCustomFieldsTab): ?>
       <div data-tab-panel="custom_fields">
         <?php if (!$customFieldTenantMap): ?>
-          <p class="muted"><?php e(t('Assign tenants first to edit custom fields')); ?></p>
+          <?php
+          $emptyState = [
+            'message' => t('Assign tenants first to edit custom fields'),
+            'size' => 'compact',
+          ];
+          require templatePath('partials/app-empty-state.phtml');
+          ?>
         <?php else: ?>
           <?php $hasRenderedCustomFields = false; ?>
           <?php $hasConfiguredTenantDefinitions = false; ?>
diff --git a/pages/admin/users/edit(default).phtml b/pages/admin/users/edit(default).phtml
index dd19523..a767d3a 100644
--- a/pages/admin/users/edit(default).phtml
+++ b/pages/admin/users/edit(default).phtml
@@ -136,11 +136,11 @@ if ($lastLoginAt !== '') {
     $isReadOnly = !$canEditUser;
     $canEditAssignments = $canEditAssignments ?? false;
     $permissionRows = $permissionRows ?? [];
-    $showPermissions = !empty($permissionRows) && $canViewPermissionsTable;
+    $showPermissions = $canViewPermissionsTable;
     $passwordResets = $passwordResets ?? [];
-    $showPasswordResets = $canViewSecurityArtifacts && !empty($passwordResets);
+    $showPasswordResets = $canViewSecurityArtifacts;
     $rememberTokens = $rememberTokens ?? [];
-    $showRememberTokens = $canViewSecurityArtifacts && !empty($rememberTokens);
+    $showRememberTokens = $canViewSecurityArtifacts;
     $showDangerZone = $canDeleteUser;
     $dangerZoneDeleteFormId = $showDangerZone ? 'user-delete-form' : '';
     $dangerZoneWarning = t('This will permanently delete this user.');