diff --git a/modules/kea/pages/edit.php b/modules/kea/pages/edit.php
index 7f409a2..2bbb85a 100644
--- a/modules/kea/pages/edit.php
+++ b/modules/kea/pages/edit.php
@@ -85,7 +85,10 @@ $selectedIp = (string)($metadata['desired_ip'] ?? '');
       <h2 class="section-title">KEA Eintrag bearbeiten</h2>
       <p>Zusatzdaten werden separat von der KEA-Datenbank gespeichert.</p>
     </div>
-    <a class="nav-link" href="/module/kea">Zurueck</a>
+    <div class="setup-actions">
+      <a class="nav-link" href="/module/kea/groups">Gruppen verwalten</a>
+      <a class="nav-link" href="/module/kea">Zurueck</a>
+    </div>
   </div>
 
   <?php if ($error): ?>
@@ -143,6 +146,9 @@ $selectedIp = (string)($metadata['desired_ip'] ?? '');
               <option value="<?= e($group) ?>" <?= $selectedGroup === $group ? 'selected' : '' ?>><?= e($group) ?></option>
             <?php endforeach; ?>
           </select>
+          <?php if ($groups === []): ?>
+            <small class="muted">Noch keine Gruppen definiert. Oeffne zuerst Gruppen verwalten.</small>
+          <?php endif; ?>
         </label>
         <label class="setup-field">
           <span>Feste IP</span>
diff --git a/modules/kea/partials/dashboard.php b/modules/kea/partials/dashboard.php
index 7b35980..f47fe1c 100644
--- a/modules/kea/partials/dashboard.php
+++ b/modules/kea/partials/dashboard.php
@@ -12,7 +12,10 @@
             <h2 class="section-title">KEA DHCP Hosts</h2>
             <p>Reservierungen und aktuelle Leases aus der KEA-Datenbank.</p>
         </div>
-        <a class="cta-button" href="/modules/setup/kea">Setup</a>
+        <div class="setup-actions">
+            <a class="cta-button" href="/module/kea/groups">Gruppen verwalten</a>
+            <a class="nav-link" href="/modules/setup/kea">Setup</a>
+        </div>
     </div>
 
     <?php if ($error): ?>