diff --git a/AstraOS/Frontend/HTML/dashboard.html b/AstraOS/Frontend/HTML/dashboard.html
index 5522252..aca0e8b 100644
--- a/AstraOS/Frontend/HTML/dashboard.html
+++ b/AstraOS/Frontend/HTML/dashboard.html
@@ -34,6 +34,17 @@
     <h2 class="text-4xl font-bold tracking-wide {% if maintenance_active %}text-yellow-300{% else %}text-purple-300{% endif %}">Dashboard</h2>
 </header>
 
+<!-- FLASH MESSAGES -->
+{% with messages = get_flashed_messages(with_categories=true) %}
+    {% if messages %}
+        {% for category, message in messages %}
+            <div class="rounded-md bg-{{ 'red' if category == 'danger' else ('green' if category == 'success' else 'blue') }}-500/20 p-4 text-sm text-{{ 'red' if category == 'danger' else ('green' if category == 'success' else 'blue') }}-300 border border-{{ 'red' if category == 'danger' else ('green' if category == 'success' else 'blue') }}-500/30">
+                {{ message }}
+            </div>
+        {% endfor %}
+    {% endif %}
+{% endwith %}
+
 <div class="grid grid-cols-1 gap-8">
     <div class="glow-card opacity-0 translate-y-8 lg:col-span-2 bg-black/40 p-6 rounded-xl backdrop-blur
                 {% if maintenance_active %}border border-yellow-500/30{% else %}border border-purple-500/20{% endif %}">
diff --git a/AstraOS/Frontend/HTML/settings.html b/AstraOS/Frontend/HTML/settings.html
index c383051..c2c7eb4 100644
--- a/AstraOS/Frontend/HTML/settings.html
+++ b/AstraOS/Frontend/HTML/settings.html
@@ -85,4 +85,3 @@
     </div>
 </div>
 {% endblock %}
-
diff --git a/AstraOS/Frontend/HTML/user_management.html b/AstraOS/Frontend/HTML/user_management.html
index 6cd2fa9..9c779b5 100644
--- a/AstraOS/Frontend/HTML/user_management.html
+++ b/AstraOS/Frontend/HTML/user_management.html
@@ -30,6 +30,18 @@
                 + Neuen Benutzer hinzufügen
             </button>
         </header>
+
+        <!-- FLASH MESSAGES -->
+        {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %}
+                {% for category, message in messages %}
+                    <div class="rounded-md bg-{{ 'red' if category == 'danger' else ('green' if category == 'success' else 'blue') }}-500/20 p-4 text-sm text-{{ 'red' if category == 'danger' else ('green' if category == 'success' else 'blue') }}-300 border border-{{ 'red' if category == 'danger' else ('green' if category == 'success' else 'blue') }}-500/30">
+                        {{ message }}
+                    </div>
+                {% endfor %}
+            {% endif %}
+        {% endwith %}
+
         <!-- USER TABLE -->
         <div class="bg-black/40 rounded-xl backdrop-blur-lg overflow-hidden
                     {% if maintenance_active %}border border-yellow-500/30{% else %}border border-purple-500/20{% endif %}">