diff --git a/controllers/admin.controller.js b/controllers/admin.controller.js
index ad2d5f8..87a6c7e 100644
--- a/controllers/admin.controller.js
+++ b/controllers/admin.controller.js
@@ -1,6 +1,10 @@
 const db = require("../db");
-const { createUser, getAllUsers } = require("../services/admin.service");
 const bcrypt = require("bcrypt");
+const {
+  createUser,
+  getAllUsers,
+  updateUserById,
+} = require("../services/admin.service");
 
 async function listUsers(req, res) {
   const { q } = req.query;
@@ -34,6 +38,7 @@ function showCreateUser(req, res) {
 
 async function postCreateUser(req, res) {
   let {
+    title,
     first_name,
     last_name,
     username,
@@ -43,6 +48,7 @@ async function postCreateUser(req, res) {
     arztnummer,
   } = req.body;
 
+  title = title?.trim();
   first_name = first_name?.trim();
   last_name = last_name?.trim();
   username = username?.trim();
@@ -69,11 +75,13 @@ async function postCreateUser(req, res) {
     // Sicherheit: Mitarbeiter dürfen keine Arzt-Daten haben
     fachrichtung = null;
     arztnummer = null;
+    title = null;
   }
 
   try {
     await createUser(
       db,
+      title,
       first_name,
       last_name,
       username,
@@ -265,6 +273,50 @@ async function showInvoiceOverview(req, res) {
   }
 }
 
+async function updateUser(req, res) {
+  const userId = req.params.id;
+
+  let { title, first_name, last_name, username, role } = req.body;
+
+  title = title?.trim() || null;
+  first_name = first_name?.trim();
+  last_name = last_name?.trim();
+  username = username?.trim();
+  role = role?.trim();
+
+  try {
+    // ✅ Fehlende Felder aus DB holen (weil disabled inputs nicht gesendet werden)
+    const [rows] = await db
+      .promise()
+      .query("SELECT * FROM users WHERE id = ?", [userId]);
+
+    if (!rows.length) {
+      req.session.flash = { type: "danger", message: "User nicht gefunden" };
+      return res.redirect("/admin/users");
+    }
+
+    const current = rows[0];
+
+    // ✅ Fallback: wenn Felder nicht gesendet wurden -> alte Werte behalten
+    const updatedData = {
+      title: title ?? current.title,
+      first_name: first_name ?? current.first_name,
+      last_name: last_name ?? current.last_name,
+      username: username ?? current.username,
+      role: role ?? current.role,
+    };
+
+    await updateUserById(db, userId, updatedData);
+
+    req.session.flash = { type: "success", message: "User aktualisiert ✅" };
+    return res.redirect("/admin/users");
+  } catch (err) {
+    console.error(err);
+    req.session.flash = { type: "danger", message: "Fehler beim Speichern" };
+    return res.redirect("/admin/users");
+  }
+}
+
 module.exports = {
   listUsers,
   showCreateUser,
@@ -274,4 +326,5 @@ module.exports = {
   activateUser,
   deactivateUser,
   showInvoiceOverview,
+  updateUser,
 };
diff --git a/controllers/patient.controller.js b/controllers/patient.controller.js
index 089a21a..ffdfc2b 100644
--- a/controllers/patient.controller.js
+++ b/controllers/patient.controller.js
@@ -210,13 +210,14 @@ function moveToWaitingRoom(req, res) {
     `
     UPDATE patients
     SET waiting_room = 1,
-        discharged = 0
+        discharged = 0,
+        active = 1
     WHERE id = ?
     `,
     [id],
     (err) => {
       if (err) return res.send("Fehler beim Verschieben ins Wartezimmer");
-      res.redirect("/patients");
+      return res.redirect("/dashboard"); // optional: direkt Dashboard
     }
   );
 }
@@ -245,11 +246,16 @@ function showPatientOverview(req, res) {
   `;
 
   const notesSql = `
-    SELECT *
-    FROM patient_notes
-    WHERE patient_id = ?
-    ORDER BY created_at DESC
-  `;
+  SELECT
+    pn.*,
+    u.title,
+    u.first_name,
+    u.last_name
+  FROM patient_notes pn
+  LEFT JOIN users u ON pn.created_by = u.id
+  WHERE pn.patient_id = ?
+  ORDER BY pn.created_at DESC
+`;
 
   const medicationVariantsSql = `
     SELECT
@@ -381,8 +387,9 @@ function addPatientNote(req, res) {
   }
 
   db.query(
-    "INSERT INTO patient_notes (patient_id, note) VALUES (?, ?)",
-    [patientId, note],
+    "INSERT INTO patient_notes (patient_id, created_by, note) VALUES (?, ?, ?)",
+    [patientId, req.session.user.id, note],
+
     (err) => {
       if (err) return res.send("Fehler beim Speichern der Notiz");
       res.redirect(`/patients/${patientId}/overview`);
@@ -407,11 +414,21 @@ function dischargePatient(req, res) {
   const patientId = req.params.id;
 
   db.query(
-    "UPDATE patients SET discharged = 1 WHERE id = ?",
+    `
+    UPDATE patients
+    SET discharged = 1,
+        waiting_room = 0,
+        active = 0
+    WHERE id = ?
+    `,
     [patientId],
     (err) => {
-      if (err) return res.send("Fehler beim Entlassen des Patienten");
-      res.redirect("/waiting-room");
+      if (err) {
+        console.error(err);
+        return res.send("Fehler beim Entlassen des Patienten");
+      }
+
+      return res.redirect("/dashboard");
     }
   );
 }
@@ -462,7 +479,8 @@ function movePatientToWaitingRoom(req, res) {
     UPDATE patients
     SET waiting_room = 1,
         discharged = 0,
-        status = 'waiting'
+        status = 'waiting',
+        active = 1
     WHERE id = ?
     `,
     [patientId],
@@ -481,7 +499,7 @@ function movePatientToWaitingRoom(req, res) {
         message: "Patient wurde ins Wartezimmer gesetzt",
       };
 
-      res.redirect("/waiting-room");
+      return res.redirect("/dashboard");
     }
   );
 }
diff --git a/public/css/style.css b/public/css/style.css
index 618583e..5d3a129 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -3,51 +3,51 @@
 ========================= */
 
 .waiting-monitor {
-    border: 3px solid #343a40;
-    border-radius: 10px;
-    padding: 15px;
-    min-height: 45vh;       /* untere Hälfte */
-    background-color: #f8f9fa;
+  border: 3px solid #343a40;
+  border-radius: 10px;
+  padding: 15px;
+  min-height: 45vh; /* untere Hälfte */
+  background-color: #f8f9fa;
 }
 
 .waiting-grid {
-    display: grid;
-    grid-template-columns: repeat(7, 1fr);
-    grid-template-rows: repeat(3, 1fr);
-    gap: 10px;
-    height: 100%;
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  gap: 10px;
+  height: 100%;
 }
 
 .waiting-slot {
-    border: 2px dashed #adb5bd;
-    border-radius: 6px;
-    padding: 10px;
-    background-color: #ffffff;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
+  border: 2px dashed #adb5bd;
+  border-radius: 6px;
+  padding: 10px;
+  background-color: #ffffff;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
 }
 
 .waiting-slot.occupied {
-    border-style: solid;
-    border-color: #198754;
-    background-color: #e9f7ef;
+  border-style: solid;
+  border-color: #198754;
+  background-color: #e9f7ef;
 }
 
 .waiting-slot .name {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 .waiting-slot .birthdate {
-    font-size: 0.8rem;
-    color: #6c757d;
+  font-size: 0.8rem;
+  color: #6c757d;
 }
 
 .waiting-slot .placeholder {
-    color: #adb5bd;
-    font-style: italic;
+  color: #adb5bd;
+  font-style: italic;
 }
 
 .waiting-slot.empty {
@@ -62,3 +62,19 @@
   opacity: 0.4;
 }
 
+.auto-hide-flash {
+  animation: flashFadeOut 3s forwards;
+}
+
+@keyframes flashFadeOut {
+  0% {
+    opacity: 1;
+  }
+  70% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+    visibility: hidden;
+  }
+}
diff --git a/routes/admin.routes.js b/routes/admin.routes.js
index e868f73..ed2e1e2 100644
--- a/routes/admin.routes.js
+++ b/routes/admin.routes.js
@@ -10,6 +10,7 @@ const {
   activateUser,
   deactivateUser,
   showInvoiceOverview,
+  updateUser,
 } = require("../controllers/admin.controller");
 
 const { requireAdmin } = require("../middleware/auth.middleware");
@@ -23,5 +24,6 @@ router.post("/users/reset-password/:id", requireAdmin, resetUserPassword);
 router.post("/users/activate/:id", requireAdmin, activateUser);
 router.post("/users/deactivate/:id", requireAdmin, deactivateUser);
 router.get("/invoices", requireAdmin, showInvoiceOverview);
+router.post("/users/update/:id", requireAdmin, updateUser);
 
 module.exports = router;
diff --git a/services/admin.service.js b/services/admin.service.js
index 5846c1b..77c47da 100644
--- a/services/admin.service.js
+++ b/services/admin.service.js
@@ -2,6 +2,7 @@ const bcrypt = require("bcrypt");
 
 async function createUser(
   db,
+  title,
   first_name,
   last_name,
   username,
@@ -15,9 +16,18 @@ async function createUser(
   return new Promise((resolve, reject) => {
     db.query(
       `INSERT INTO users
-       (first_name, last_name, username, password, role, fachrichtung, arztnummer, active)
-       VALUES (?, ?, ?, ?, ?, ?, ?, 1)`,
-      [first_name, last_name, username, hash, role, fachrichtung, arztnummer],
+       (title, first_name, last_name, username, password, role, fachrichtung, arztnummer, active)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, 1)`,
+      [
+        title,
+        first_name,
+        last_name,
+        username,
+        hash,
+        role,
+        fachrichtung,
+        arztnummer,
+      ],
       (err) => {
         if (err) {
           if (err.code === "ER_DUP_ENTRY") {
@@ -57,7 +67,27 @@ async function getAllUsers(db, search = null) {
   return rows;
 }
 
+async function updateUserById(db, userId, data) {
+  const { title, first_name, last_name, username, role } = data;
+
+  const [result] = await db.promise().query(
+    `
+    UPDATE users
+    SET title = ?,
+        first_name = ?,
+        last_name = ?,
+        username = ?,
+        role = ?
+    WHERE id = ?
+    `,
+    [title, first_name, last_name, username, role, userId]
+  );
+
+  return result;
+}
+
 module.exports = {
   createUser,
   getAllUsers,
+  updateUserById,
 };
diff --git a/views/admin_create_user.ejs b/views/admin_create_user.ejs
index 5a3c341..d24a06b 100644
--- a/views/admin_create_user.ejs
+++ b/views/admin_create_user.ejs
@@ -1,90 +1,108 @@
 <!DOCTYPE html>
 <html lang="de">
-<head>
-    <meta charset="UTF-8">
+  <head>
+    <meta charset="UTF-8" />
     <title>Benutzer anlegen</title>
-    <link rel="stylesheet" href="/css/bootstrap.min.css">
-</head>
-<body class="bg-light">
+    <link rel="stylesheet" href="/css/bootstrap.min.css" />
+  </head>
+  <body class="bg-light">
+    <div class="container mt-5">
+      <%- include("partials/flash") %>
 
-<div class="container mt-5">
-    <%- include("partials/flash") %>
-
-    <div class="card shadow mx-auto" style="max-width: 500px;">
+      <div class="card shadow mx-auto" style="max-width: 500px">
         <div class="card-body">
-            <h3 class="text-center mb-3">Benutzer anlegen</h3>
+          <h3 class="text-center mb-3">Benutzer anlegen</h3>
 
-            <% if (error) { %>
-                <div class="alert alert-danger"><%= error %></div>
-            <% } %>
+          <% if (error) { %>
+          <div class="alert alert-danger"><%= error %></div>
+          <% } %>
 
-            <form method="POST" action="/admin/create-user">
+          <form method="POST" action="/admin/create-user">
+            <!-- VORNAME -->
+            <input
+              class="form-control mb-3"
+              name="first_name"
+              placeholder="Vorname"
+              required
+            />
 
-                <!-- VORNAME -->
-                <input class="form-control mb-3"
-                       name="first_name"
-                       placeholder="Vorname"
-                       required>
+            <!-- NACHNAME -->
+            <input
+              class="form-control mb-3"
+              name="last_name"
+              placeholder="Nachname"
+              required
+            />
 
-                <!-- NACHNAME -->
-                <input class="form-control mb-3"
-                       name="last_name"
-                       placeholder="Nachname"
-                       required>
+            <!-- TITEL -->
+            <input
+              class="form-control mb-3"
+              name="title"
+              placeholder="Titel (z.B. Dr., Prof.)"
+            />
 
-                <!-- BENUTZERNAME (LOGIN) -->
-                <input class="form-control mb-3"
-                       name="username"
-                       placeholder="Benutzername (Login)"
-                       required>
+            <!-- BENUTZERNAME (LOGIN) -->
+            <input
+              class="form-control mb-3"
+              name="username"
+              placeholder="Benutzername (Login)"
+              required
+            />
 
-                <!-- PASSWORT -->
-                <input class="form-control mb-3"
-                       type="password"
-                       name="password"
-                       placeholder="Passwort"
-                       required>
+            <!-- PASSWORT -->
+            <input
+              class="form-control mb-3"
+              type="password"
+              name="password"
+              placeholder="Passwort"
+              required
+            />
 
-                <!-- ROLLE -->
-                <select class="form-select mb-3"
-                        name="role"
-                        id="roleSelect"
-                        required>
-                    <option value="">Rolle wählen</option>
-                    <option value="mitarbeiter">Mitarbeiter</option>
-                    <option value="arzt">Arzt</option>
-                </select>
+            <!-- ROLLE -->
+            <select
+              class="form-select mb-3"
+              name="role"
+              id="roleSelect"
+              required
+            >
+              <option value="">Rolle wählen</option>
+              <option value="mitarbeiter">Mitarbeiter</option>
+              <option value="arzt">Arzt</option>
+            </select>
 
-                <!-- ARZT-FELDER -->
-                <div id="arztFields" style="display:none;">
-                    <input class="form-control mb-3"
-                           name="fachrichtung"
-                           placeholder="Fachrichtung">
+            <!-- ARZT-FELDER -->
+            <div id="arztFields" style="display: none">
+              <input
+                class="form-control mb-3"
+                name="fachrichtung"
+                placeholder="Fachrichtung"
+              />
 
-                    <input class="form-control mb-3"
-                           name="arztnummer"
-                           placeholder="Arztnummer">
-                </div>
-
-                <button class="btn btn-primary w-100">
-                    Benutzer erstellen
-                </button>
-            </form>
-
-            <div class="text-center mt-3">
-                <a href="/dashboard">Zurück</a>
+              <input
+                class="form-control mb-3"
+                name="arztnummer"
+                placeholder="Arztnummer"
+              />
             </div>
+
+            <button class="btn btn-primary w-100">Benutzer erstellen</button>
+          </form>
+
+          <div class="text-center mt-3">
+            <a href="/dashboard">Zurück</a>
+          </div>
         </div>
+      </div>
     </div>
-</div>
 
-<script>
-document.getElementById("roleSelect").addEventListener("change", function () {
-    const arztFields = document.getElementById("arztFields");
-    arztFields.style.display = this.value === "arzt" ? "block" : "none";
-});
-</script>
-<script src="/js/admin_create_user.js" defer></script>
-
-</body>
+    <script>
+      document
+        .getElementById("roleSelect")
+        .addEventListener("change", function () {
+          const arztFields = document.getElementById("arztFields");
+          arztFields.style.display = this.value === "arzt" ? "block" : "none";
+        });
+    </script>
+    <script src="/js/admin_create_user.js" defer></script>
+  </body>
 </html>
diff --git a/views/admin_users.ejs b/views/admin_users.ejs
index 44f7e03..68d50b2 100644
--- a/views/admin_users.ejs
+++ b/views/admin_users.ejs
@@ -1,181 +1,213 @@
 <!DOCTYPE html>
 <html lang="de">
 <head>
-    <meta charset="UTF-8">
-    <title>User Verwaltung</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- Bootstrap 5 -->
-   <link rel="stylesheet" href="/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/bootstrap-icons/bootstrap-icons.min.css">
+  <meta charset="UTF-8" />
+  <title>User Verwaltung</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+  <link rel="stylesheet" href="/css/bootstrap.min.css">
+   <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/bootstrap-icons/bootstrap-icons.min.css">
+  <script src="/js/bootstrap.bundle.min.js"></script>
+
+  <!-- ✅ Inline Edit wie bei medications -->
+  <script src="/js/services-lock.js"></script>
+
+  <style>
+    input.form-control { box-shadow: none !important; }
+
+    input.form-control:disabled {
+      background-color: #fff !important;
+      color: #212529 !important;
+      opacity: 1 !important;
+      border: none !important;
+      box-shadow: none !important;
+      outline: none !important;
+    }
+
+    input.form-control:disabled:focus {
+      box-shadow: none !important;
+      outline: none !important;
+    }
+
+    /* Inaktive User ROT */
+    tr.table-secondary > td {
+      background-color: #f8d7da !important;
+    }
+  </style>
 </head>
+
 <body class="bg-light">
 
-<!-- NAVBAR -->
 <nav class="navbar navbar-dark bg-dark position-relative px-3">
+  <div class="position-absolute top-50 start-50 translate-middle d-flex align-items-center gap-2 text-white">
+    <i class="bi bi-shield-lock fs-4"></i>
+    <span class="fw-semibold fs-5">User Verwaltung</span>
+  </div>
 
-    <!-- 🟢 ZENTRIERTER TITEL -->
-    <div class="position-absolute top-50 start-50 translate-middle
-                d-flex align-items-center gap-2 text-white">
-        <i class="bi bi-shield-lock fs-4"></i>
-        <span class="fw-semibold fs-5">User Verwaltung</span>
-    </div>
-
-    <!-- 🔵 RECHTS: DASHBOARD -->
-        <div class="ms-auto">
-            <a href="/dashboard" class="btn btn-outline-primary btn-sm">
-                ⬅️ Dashboard
-            </a>
-        </div>
-
+  <div class="ms-auto">
+    <a href="/dashboard" class="btn btn-outline-light btn-sm">⬅️ Dashboard</a>
+  </div>
 </nav>
 
-
-<!-- CONTENT -->
 <div class="container mt-4">
-    <%- include("partials/flash") %>
-    <div class="card shadow">
-        <div class="card-body">
+  <%- include("partials/flash") %>
 
-            <h4 class="mb-3">Benutzerübersicht</h4>
+  <div class="card shadow">
+    <div class="card-body">
 
-            <div class="table-responsive">
-                <div class="mb-3 text-end">
-                    <a href="/admin/create-user" class="btn btn-primary">
-                        + Neuen Benutzer anlegen
-                    </a>
-                </div>
-                <div class="row mb-3 align-items-end">
-                    <div class="col-md-6">
-                        <form method="GET" action="/admin/users" class="d-flex gap-2">
-                        <input
-                            type="text"
-                            name="q"
-                            class="form-control"
-                            placeholder="🔍 Benutzer suchen (Name oder Username)"
-                            value="<%= query?.q || '' %>">
+      <h4 class="mb-3">Benutzerübersicht</h4>
 
-                        <button class="btn btn-outline-primary">
-                            Suchen
-                        </button>
+      <!-- ➕ Neu -->
+      <div class="mb-3 text-end">
+        <a href="/admin/create-user" class="btn btn-primary">
+          + Neuen Benutzer anlegen
+        </a>
+      </div>
 
-                        <% if (query?.q) { %>
-                            <a href="/admin/users" class="btn btn-outline-secondary">
-                            Reset
-                            </a>
-                        <% } %>
-                        </form>
-                    </div>
-                    </div>
+      <!-- 🔍 Suche -->
+      <form method="GET" action="/admin/users" class="d-flex gap-2 mb-3">
+        <input
+          type="text"
+          name="q"
+          class="form-control"
+          placeholder="🔍 Benutzer suchen (Name oder Username)"
+          value="<%= query?.q || '' %>"
+        >
+        <button class="btn btn-outline-primary">Suchen</button>
 
+        <% if (query?.q) { %>
+          <a href="/admin/users" class="btn btn-outline-secondary">Reset</a>
+        <% } %>
+      </form>
 
-                <table class="table table-bordered table-hover align-middle">
-                    <thead class="table-dark">
-                    <tr>
-                        <th>ID</th>
-                        <th>Name</th>
-                        <th>Rolle</th>
-                        <th>Status</th>
-                        <th style="width: 340px;">Aktionen</th>
-                    </tr>
-                    </thead>
-                    <tbody>
+      <div class="table-responsive">
+        <table class="table table-bordered table-hover table-sm align-middle">
 
-                    <% users.forEach(u => { %>
-                        <tr>
-                            <td><%= u.id %></td>
-                            <td>
-                                <strong><%= u.first_name %> <%= u.last_name %></strong><br>
-                                <small class="text-muted">@<%= u.username %></small>
-                            </td>
-                            <td>
-                                <% if (u.role === "arzt") { %>
-                                    <span class="badge bg-warning text-dark">Arzt</span>
-                                <% } else { %>
-                                    <span class="badge bg-info text-dark">Mitarbeiter</span>
-                                <% } %>
-                            </td>
-                            <td>
-                                <% if (u.active === 0) { %>
-                                    <span class="badge bg-secondary">Inaktiv</span>
-                                <% } else if (u.lock_until && new Date(u.lock_until) > new Date()) { %>
-                                    <span class="badge bg-danger">Gesperrt</span>
-                                <% } else { %>
-                                    <span class="badge bg-success">Aktiv</span>
-                                <% } %>
-                            </td>
+          <thead class="table-dark">
+            <tr>
+              <th>ID</th>
+              <th>Titel</th>
+              <th>Vorname</th>
+              <th>Nachname</th>
+              <th>Username</th>
+              <th>Rolle</th>
+              <th>Status</th>
+              <th style="width: 260px;">Aktionen</th>
+            </tr>
+          </thead>
 
-                            <td>
-                                <% if (u.id !== currentUser.id) { %>
+          <tbody>
+          <% users.forEach(u => { %>
 
-                                    <!-- AKTIV / INAKTIV -->
-                                    <% if (u.active === 1) { %>
-                                        <form method="POST"
-                                              action="/admin/users/deactivate/<%= u.id %>"
-                                              class="mb-1">
-                                            <button class="btn btn-sm btn-secondary w-100">
-                                                Deaktivieren
-                                            </button>
-                                        </form>
-                                    <% } else { %>
-                                        <form method="POST"
-                                              action="/admin/users/activate/<%= u.id %>"
-                                              class="mb-1">
-                                            <button class="btn btn-sm btn-success w-100">
-                                                Aktivieren
-                                            </button>
-                                        </form>
-                                    <% } %>
+            <tr class="<%= u.active ? '' : 'table-secondary' %>">
 
-                                    <!-- ROLLE ÄNDERN -->
-                                    <form method="POST"
-                                          action="/admin/users/change-role/<%= u.id %>"
-                                          class="mb-1">
-                                        <select name="role"
-                                                class="form-select form-select-sm mb-1">
-                                            <option value="mitarbeiter"
-                                                <%= u.role === "mitarbeiter" ? "selected" : "" %>>
-                                                Mitarbeiter
-                                            </option>
-                                            <option value="arzt"
-                                                <%= u.role === "arzt" ? "selected" : "" %>>
-                                                Arzt
-                                            </option>
-                                        </select>
-                                        <button class="btn btn-sm btn-warning w-100">
-                                            Rolle ändern
-                                        </button>
-                                    </form>
+              <!-- ✅ UPDATE-FORM (wie medications) -->
+              <form method="POST" action="/admin/users/update/<%= u.id %>">
 
-                                    <!-- PASSWORT RESET -->
-                                    <form method="POST"
-                                          action="/admin/users/reset-password/<%= u.id %>">
-                                        <input type="password"
-                                               name="password"
-                                               class="form-control form-control-sm mb-1"
-                                               placeholder="Neues Passwort"
-                                               required>
-                                        <button class="btn btn-sm btn-danger w-100"
-                                                onclick="return confirm('Passwort wirklich zurücksetzen?')">
-                                            Passwort zurücksetzen
-                                        </button>
-                                    </form>
+                <td><%= u.id %></td>
 
-                                <% } else { %>
-                                    <span class="text-muted fst-italic">
-                                        Du selbst
-                                    </span>
-                                <% } %>
-                            </td>
-                        </tr>
-                    <% }) %>
+                <td>
+                  <input
+                    type="text"
+                    name="title"
+                    value="<%= u.title || '' %>"
+                    class="form-control form-control-sm"
+                    disabled
+                  >
+                </td>
 
-                    </tbody>
-                </table>
-            </div>
+                <td>
+                  <input
+                    type="text"
+                    name="first_name"
+                    value="<%= u.first_name %>"
+                    class="form-control form-control-sm"
+                    disabled
+                  >
+                </td>
+
+                <td>
+                  <input
+                    type="text"
+                    name="last_name"
+                    value="<%= u.last_name %>"
+                    class="form-control form-control-sm"
+                    disabled
+                  >
+                </td>
+
+                <td>
+                  <input
+                    type="text"
+                    name="username"
+                    value="<%= u.username %>"
+                    class="form-control form-control-sm"
+                    disabled
+                  >
+                </td>
+
+                <td>
+                  <select
+                    name="role"
+                    class="form-select form-select-sm"
+                    disabled
+                  >
+                    <option value="mitarbeiter" <%= u.role === "mitarbeiter" ? "selected" : "" %>>
+                      Mitarbeiter
+                    </option>
+                    <option value="arzt" <%= u.role === "arzt" ? "selected" : "" %>>
+                      Arzt
+                    </option>
+                  </select>
+                </td>
+
+                <td class="text-center">
+                  <% if (u.active === 0) { %>
+                    <span class="badge bg-secondary">Inaktiv</span>
+                  <% } else if (u.lock_until && new Date(u.lock_until) > new Date()) { %>
+                    <span class="badge bg-danger">Gesperrt</span>
+                  <% } else { %>
+                    <span class="badge bg-success">Aktiv</span>
+                  <% } %>
+                </td>
+
+                <td class="d-flex gap-2">
+
+                  <button class="btn btn-sm btn-outline-success save-btn" disabled>
+                    💾
+                  </button>
+
+                  <button type="button" class="btn btn-sm btn-outline-warning lock-btn">
+                    🔓
+                  </button>
+
+              </form>
+
+              <!-- ✅ Aktiv / Deaktiv separat -->
+              <% if (u.id !== currentUser.id) { %>
+                <form method="POST" action="/admin/users/<%= u.active ? "deactivate" : "activate" %>/<%= u.id %>">
+                  <button class="btn btn-sm <%= u.active ? "btn-outline-danger" : "btn-outline-success" %>">
+                    <%= u.active ? "⛔" : "✅" %>
+                  </button>
+                </form>
+              <% } else { %>
+                <span class="text-muted fst-italic small align-self-center">
+                  Du selbst
+                </span>
+              <% } %>
+
+                </td>
+            </tr>
+
+          <% }) %>
+          </tbody>
+
+        </table>
+      </div>
 
-        </div>
     </div>
-
+  </div>
 </div>
 
 </body>
diff --git a/views/dashboard.ejs b/views/dashboard.ejs
index 6c4a80c..b85e78e 100644
--- a/views/dashboard.ejs
+++ b/views/dashboard.ejs
@@ -166,10 +166,6 @@
           <i class="bi bi-people"></i> Patienten
         </a>
 
-        <a href="/waiting-room" class="nav-item">
-          <i class="bi bi-chair"></i> Wartezimmer
-        </a>
-
         <a href="/medications" class="nav-item">
           <i class="bi bi-capsule"></i> Medikamente
         </a>
diff --git a/views/partials/flash.ejs b/views/partials/flash.ejs
index 01e3c42..f4538f4 100644
--- a/views/partials/flash.ejs
+++ b/views/partials/flash.ejs
@@ -1,6 +1,9 @@
 <% if (flash) { %>
-    <div class="alert alert-<%= flash.type %> alert-dismissible fade show" role="alert">
-        <%= flash.message %>
-        <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-    </div>
+<div
+  class="alert alert-<%= flash.type %> alert-dismissible fade show auto-hide-flash"
+  role="alert"
+>
+  <%= flash.message %>
+  <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
+</div>
 <% } %>
diff --git a/views/patient_overview.ejs b/views/patient_overview.ejs
index 052c869..1d2c891 100644
--- a/views/patient_overview.ejs
+++ b/views/patient_overview.ejs
@@ -84,13 +84,13 @@
           ✏️ Patient bearbeiten
         </a>
 
-        <form
-          method="POST"
-          action="/patients/<%= patient.id %>/discharge"
-          class="d-inline"
-          onsubmit="return confirm('Patient wirklich entlassen?')"
-        >
-          <button class="btn btn-danger">🟥 Entlassen</button>
+        <form method="POST" action="/patients/<%= patient.id %>/discharge">
+          <button
+            class="btn btn-danger btn-sm"
+            onclick="return confirm('Patient wirklich entlassen?')"
+          >
+            ✅ Entlassen
+          </button>
         </form>
       </div>
 
@@ -142,7 +142,9 @@
                 <% } else { %> <% notes.forEach(n => { %>
                 <div class="mb-3 p-2 border rounded bg-light">
                   <div class="small text-muted">
-                    <%= new Date(n.created_at).toLocaleString("de-DE") %>
+                    <%= new Date(n.created_at).toLocaleString("de-DE") %> <% if
+                    (n.first_name && n.last_name) { %> – <%= (n.title ? n.title
+                    + " " : "") %><%= n.first_name %> <%= n.last_name %> <% } %>
                   </div>
                   <div><%= n.note %></div>
                 </div>
diff --git a/views/waiting_room.ejs b/views/waiting_room.ejs
deleted file mode 100644
index 1cfcc68..0000000
--- a/views/waiting_room.ejs
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html lang="de">
-  <head>
-    <meta charset="UTF-8" />
-    <title>Wartezimmer</title>
-    <link rel="stylesheet" href="/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="/bootstrap-icons/bootstrap-icons.min.css" />
-  </head>
-  <body>
-    <nav class="navbar navbar-dark bg-dark position-relative px-3">
-      <!-- 🟢 ZENTRIERTER TITEL -->
-      <div
-        class="position-absolute top-50 start-50 translate-middle d-flex align-items-center gap-2 text-white"
-      >
-        <span style="font-size: 1.4rem">🪑</span>
-        <span class="fw-semibold fs-5">Wartezimmer</span>
-      </div>
-
-      <!-- 🔵 RECHTS: DASHBOARD -->
-      <div class="ms-auto">
-        <a href="/dashboard" class="btn btn-outline-primary btn-sm">
-          ⬅️ Dashboard
-        </a>
-      </div>
-    </nav>
-
-    <div class="container mt-4">
-      <!-- ✅ EINMAL Flash anzeigen -->
-      <%- include("partials/flash") %> <% if (patients.length === 0) { %>
-      <div class="alert alert-info">Keine Patienten im Wartezimmer</div>
-      <% } else { %>
-
-      <table class="table table-bordered table-hover">
-        <thead class="table-light">
-          <tr>
-            <th>Name</th>
-            <th>Geburtstag</th>
-            <th>Aktion</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% patients.forEach(p => { %>
-          <tr>
-            <td><strong><%= p.firstname %> <%= p.lastname %></strong></td>
-            <td><%= new Date(p.birthdate).toLocaleDateString("de-DE") %></td>
-            <td>
-              <% if (user.role === 'arzt') { %>
-              <form
-                method="POST"
-                action="patients/waiting-room/call/<%= p.id %>"
-                class="d-inline"
-              >
-                <button class="btn btn-sm btn-success">▶️ Aufrufen</button>
-              </form>
-              <% } else { %>
-              <span class="text-muted">🔒 Nur Arzt</span>
-              <% } %>
-            </td>
-          </tr>
-          <% }) %>
-        </tbody>
-      </table>
-
-      <% } %>
-    </div>
-  </body>
-</html>