diff --git a/partials/landing/account/dashboard.php b/partials/landing/account/dashboard.php
index f75bb04..ff7194f 100644
--- a/partials/landing/account/dashboard.php
+++ b/partials/landing/account/dashboard.php
@@ -216,6 +216,11 @@ if (isset($_GET['edit_event'])) {
   $editEvent = $stmt->fetch(PDO::FETCH_ASSOC) ?: null;
 }
 ?>
+<?php
+$actionEvent = $editing ? 'event_update' : 'event_add';
+$startVal = $editEvent ? date('Y-m-d\TH:i', strtotime((string)$editEvent['starts_at'])) : '';
+$allowNoKidsChecked = $editEvent ? ((int)$editEvent['allow_kids'] === 0) : false;
+?>
 <main class="section">
   <div class="container" style="display:flex; align-items:center; justify-content:space-between; flex-wrap:wrap; gap:12px;">
     <div>
@@ -470,62 +475,65 @@ if (isset($_GET['edit_event'])) {
   <div class="modal" id="modalEvent">
     <div class="panel">
       <div class="head flex between center-y">
-        <h3>Neues Event</h3>
+        <h3><?= $editing ? 'Event bearbeiten' : 'Neues Event' ?></h3>
         <button class="btn ghost" type="button" data-modal-close>✕</button>
       </div>
       <form class="stack gap-12" style="margin-top: 10px;" method="post" action="/dashboard#events">
-        <input type="hidden" name="action" value="event_add">
+        <input type="hidden" name="action" value="<?= htmlspecialchars($actionEvent, ENT_QUOTES) ?>">
+        <?php if ($editing && $editEvent): ?>
+          <input type="hidden" name="event_id" value="<?= (int)$editEvent['id'] ?>">
+        <?php endif; ?>
         <div class="form-grid">
           <div class="stack gap-6">
             <label class="label" for="evTitle">Titel</label>
-            <input id="evTitle" name="title" class="input" placeholder="z. B. Väter-Kaffee im Park" required>
+            <input id="evTitle" name="title" class="input" placeholder="z. B. Väter-Kaffee im Park" required value="<?= htmlspecialchars($editEvent['title'] ?? '', ENT_QUOTES) ?>">
           </div>
           <div class="stack gap-6">
             <label class="label" for="evTeaser">Kurzbeschreibung</label>
-            <input id="evTeaser" name="teaser" class="input" placeholder="Kurztext für Gäste" required>
+            <input id="evTeaser" name="teaser" class="input" placeholder="Kurztext für Gäste" required value="<?= htmlspecialchars($editEvent['teaser_public'] ?? '', ENT_QUOTES) ?>">
           </div>
         </div>
         <div class="stack gap-6">
           <label class="label" for="evDesc">Beschreibung (voll)</label>
-          <textarea id="evDesc" name="description" class="textarea" rows="3" placeholder="Was soll passieren, was mitbringen?" required></textarea>
+          <textarea id="evDesc" name="description" class="textarea" rows="3" placeholder="Was soll passieren, was mitbringen?" required><?= htmlspecialchars($editEvent['description'] ?? '', ENT_QUOTES) ?></textarea>
         </div>
         <div class="form-grid">
           <div class="stack gap-6">
             <label class="label" for="evDate">Datum & Uhrzeit</label>
-            <input id="evDate" name="starts_at" class="input" type="datetime-local" required>
+            <input id="evDate" name="starts_at" class="input" type="datetime-local" required value="<?= htmlspecialchars($startVal, ENT_QUOTES) ?>">
           </div>
           <div class="stack gap-6">
             <label class="label" for "evLoc">Ort/Label</label>
-            <input id="evLoc" name="location_label" class="input" placeholder="Park / Café">
+            <input id="evLoc" name="location_label" class="input" placeholder="Park / Café" value="<?= htmlspecialchars($editEvent['location_label'] ?? '', ENT_QUOTES) ?>">
           </div>
         </div>
         <div class="form-grid">
           <div class="stack gap-6">
             <label class="label" for="evZip">PLZ</label>
-            <input id="evZip" name="zip" class="input" maxlength="5">
+            <input id="evZip" name="zip" class="input" maxlength="5" value="<?= htmlspecialchars($editEvent['zip'] ?? '', ENT_QUOTES) ?>">
           </div>
           <div class="stack gap-6">
             <label class="label" for="evCity">Stadt</label>
-            <input id="evCity" name="city" class="input">
+            <input id="evCity" name="city" class="input" value="<?= htmlspecialchars($editEvent['city'] ?? '', ENT_QUOTES) ?>">
           </div>
         </div>
         <div class="form-grid">
           <div class="stack gap-6">
             <label class="label" for="evStreet">Straße / Adresse</label>
-            <input id="evStreet" name="street" class="input" placeholder="z. B. Musterstraße 12">
+            <input id="evStreet" name="street" class="input" placeholder="z. B. Musterstraße 12" value="<?= htmlspecialchars($editEvent['street'] ?? '', ENT_QUOTES) ?>">
             <p class="muted small">Wird zur Karten-/Umkreissuche genutzt.</p>
           </div>
           <div class="stack gap-6">
             <label class="label" for="evRegion">Region/Bezirk</label>
-            <input id="evRegion" name="region" class="input">
+            <input id="evRegion" name="region" class="input" value="<?= htmlspecialchars($editEvent['region'] ?? '', ENT_QUOTES) ?>">
           </div>
         </div>
         <div class="flex gap-8" style="flex-wrap:wrap; align-items:center;">
           <button class="btn ghost" type="button" id="btnAddrToMap">Adresse auf Karte setzen</button>
           <span class="muted small">Hält Karte und Adresse synchron.</span>
         </div>
-        <input type="hidden" id="evLat" name="lat">
-        <input type="hidden" id="evLng" name="lng">
+        <input type="hidden" id="evLat" name="lat" value="<?= htmlspecialchars($editEvent['lat'] ?? '', ENT_QUOTES) ?>">
+        <input type="hidden" id="evLng" name="lng" value="<?= htmlspecialchars($editEvent['lng'] ?? '', ENT_QUOTES) ?>">
         <div class="stack gap-6">
           <button class="btn ghost" type="button" id="btnMap">Auf Karte suchen</button>
           <div id="mapWrapper" class="map-wrapper" hidden>
@@ -544,17 +552,17 @@ if (isset($_GET['edit_event'])) {
           <div class="stack gap-6">
             <label class="label" for="evVis">Sichtbarkeit</label>
             <select id="evVis" name="visibility" class="select">
-              <option value="public">Öffentlich</option>
-              <option value="members">Nur Mitglieder</option>
+              <option value="public" <?= (($editEvent['visibility'] ?? '') === 'public') ? 'selected' : '' ?>>Öffentlich</option>
+              <option value="members" <?= (($editEvent['visibility'] ?? '') === 'members') ? 'selected' : '' ?>>Nur Mitglieder</option>
             </select>
           </div>
         </div>
         <label class="label" style="display:flex; align-items:center; gap:8px;">
-          <input type="checkbox" name="allow_kids"> Treffen ohne Kinder
+          <input type="checkbox" name="allow_kids" <?= $allowNoKidsChecked ? 'checked' : '' ?>> Treffen ohne Kinder
         </label>
         <div class="flex gap-12">
           <button class="btn ghost" type="button" data-modal-close>Abbrechen</button>
-          <button class="btn" type="submit">Event anlegen</button>
+          <button class="btn" type="submit"><?= $editing ? 'Event speichern' : 'Event anlegen' ?></button>
         </div>
       </form>
     </div>
@@ -717,4 +725,11 @@ if (isset($_GET['edit_event'])) {
     if (!parts.length) return;
     geocodeAndPlace(parts.join(', '));
   });
+
+  <?php if ($editing): ?>
+  (function(){
+    const modal = document.getElementById('modalEvent');
+    if (modal) { modal.classList.add('open'); }
+  })();
+  <?php endif; ?>
 </script>