diff --git a/backend/app/app.py b/backend/app/app.py
index 760470b4e..a3ad40b09 100644
--- a/backend/app/app.py
+++ b/backend/app/app.py
@@ -298,13 +298,14 @@ def login():
         # Daten je nach Anfrageart auslesen
         if is_json_request:
             data = request.get_json()
-            username = data.get("username")
+            username = data.get("username") or data.get("email")  # Fallback für email
             password = data.get("password")
             remember_me = data.get("remember_me", False)
         else:
-            username = request.form.get("username")
+            # Korrigierte Feldnamen - Template verwendet "email" nicht "username"
+            username = request.form.get("email")  # Geändert von "username" zu "email"
             password = request.form.get("password")
-            remember_me = request.form.get("remember-me") == "on"
+            remember_me = request.form.get("remember_me") == "on"  # Geändert von "remember-me"
         
         if not username or not password:
             error = "Benutzername und Passwort müssen angegeben werden."
diff --git a/backend/app/templates/login.html b/backend/app/templates/login.html
index 2ac17193e..6f10c0ebe 100644
--- a/backend/app/templates/login.html
+++ b/backend/app/templates/login.html
@@ -2,6 +2,11 @@
 
 {% block title %}Anmelden - Mercedes-Benz MYP Platform{% endblock %}
 
+{% block head %}
+{{ super() }}
+<meta name="csrf-token" content="{{ csrf_token() }}">
+{% endblock %}
+
 {% block extra_css %}
 <style>
     /* Mercedes-Benz Corporate Design */
@@ -246,7 +251,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="mercedes-login-container flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
+<div class="flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8">
     <div class="max-w-md w-full space-y-8">
         <!-- Header -->
         <div class="text-center">
@@ -281,7 +286,12 @@
         <!-- Login Form -->
         <div class="mercedes-card p-8">
             <form id="loginForm" method="POST" action="{{ url_for('login') if url_for else '#' }}" class="space-y-6">
-                {{ form.hidden_tag() if form }}
+                <!-- CSRF Token -->
+                {% if form %}
+                    {{ form.hidden_tag() }}
+                {% else %}
+                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+                {% endif %}
                 
                 <!-- E-Mail Address -->
                 <div>