diff --git a/Website/main.py b/Website/main.py
index de44222..c65ae50 100644
--- a/Website/main.py
+++ b/Website/main.py
@@ -325,6 +325,8 @@ def _normalize_user_doc(doc: dict | None) -> dict | None:
         "is_admin": bool(doc.get("Admin") or doc.get("is_admin", False)),
         "email": doc.get("email") or doc.get("Email") or "",
         "created_at": doc.get("created_at"),
+        "verified": doc.get("verified", True),
+        "verification_token": doc.get("verification_token"),
     }
 
 
@@ -2000,8 +2002,16 @@ def verify_account():
             flash("Konto ist bereits verifiziert. Bitte einloggen.", "success")
             return redirect(url_for("login"))
 
-        if user.get("verification_token") == token:
-            user_store.verify_user(username)
+        db_token = user.get("verification_token")
+        print(f"\n--- DEBUG TOKEN CHECK ---")
+        print(f"Username in DB gefunden: {user.get('Username')}")
+        print(f"Eingegebener Token (Formular): '{token}'")
+        print(f"Gespeicherter Token (Datenbank): '{db_token}'")
+        print(f"Stimmen überein?: {db_token == token}\n")
+
+        if db_token == token:
+            user_store.verify_user_token(username, token)
+            
             flash("Konto erfolgreich verifiziert! Sie können sich jetzt einloggen.", "success")
             return redirect(url_for("login"))
         else:
@@ -2011,7 +2021,6 @@ def verify_account():
     prefilled_username = request.args.get("username", "")
     return render_template("verify.html", username=prefilled_username)
 
-
 @app.route('/download-sample')
 def download_sample():
     # Ensure the file is only served from the specific directory