diff --git a/django/play/views.py b/django/play/views.py
index bc69f69..23f0abb 100644
--- a/django/play/views.py
+++ b/django/play/views.py
@@ -8,11 +8,22 @@ from django.http import HttpResponseRedirect
 def lobby(request, join_code):
     if not "participant_id" in request.COOKIES:
         return redirect('play:create_participant', join_code=join_code)
-
     participant_id = request.COOKIES['participant_id']
     quiz_game = get_object_or_404(QuizGame, join_code=join_code)
+    quiz = get_object_or_404(QivipQuiz, pk=quiz_game.quiz_id.id)
     participant = get_object_or_404(QuizGameParticipant, participant_id=participant_id)
-    return render(request, 'play/lobby.html', {'debug': "test", 'participant': participant})
+
+    if not participant.quiz_game.join_code == join_code:
+        participant.quiz_game = quiz_game
+        participant.save()
+
+    context = {
+        'debug': "test", 
+        'participant': participant,
+        'quiz': quiz,
+    }
+    
+    return render(request, 'play/lobby.html', context=context)
 
 def create_participant(request, join_code):
     if "participant_id" in request.COOKIES: # Umleiten, falls Teilnehmer bereits erstellt
diff --git a/django/templates/play/lobby.html b/django/templates/play/lobby.html
index 1bdd7f5..6227d01 100644
--- a/django/templates/play/lobby.html
+++ b/django/templates/play/lobby.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="container mx-auto px-4">
-    <h1>Bundeslaender Deutschland Quiz</h1>
+    <h1>{{ quiz.name }}</h1>
     <div class="mt-4 mb-4 text-center">
         <h3>Sichtbar als <b>{{ participant.display_name }}</b></h3>
     </div>