diff --git a/game/models.py b/game/models.py
index 18912a0..51eb410 100644
--- a/game/models.py
+++ b/game/models.py
@@ -99,6 +99,9 @@ def generateYoutubePlaylist(sender, instance, created, **kwargs):
 
     if creds := instance.group.owner.youtubecredentials:
         tasks.generate_playlist.delay_on_commit(creds.credentials, instance.pk)
+    else:
+        instance.playlist_loading = False
+        instance.save()
 
 
 @receiver(post_delete, sender=MusikGame)
diff --git a/game/templates/game/musikgame_form.html b/game/templates/game/musikgame_form.html
index 38ed5b6..655723a 100644
--- a/game/templates/game/musikgame_form.html
+++ b/game/templates/game/musikgame_form.html
@@ -5,10 +5,12 @@
         <i class="ri-group-2-fill"></i> {{ group.name }}
     </h1>
     <p>
-        {% if not user.youtubecredentials.credentials %}
-            <a href="{% url "youtube_login" %}" role="button"><i class="ri-youtube-fill"></i> Me connecter au compte Youtube</a>
+        {% if group.owner.youtubecredentials.credentials %}
+            <i class="ri-youtube-fill"></i> Une playlist sera générée automatiquement sur le compte Youtube de <strong>{{ group.owner }}</strong> (<strong>{{ group.owner.youtubecredentials.title }}</strong>).
+        {% elif user == group.owner %}
+            <a href="{% url "youtube_login" %}" role="button"><i class="ri-youtube-fill"></i> Connecter mon compte Youtube</a>
         {% else %}
-            <i class="ri-youtube-fill"></i> Une playlist sera générée automatiquement sur le compte Youtube <strong>{{ user.youtubecredentials.title }}</strong>.
+            <small>Aucune playlist Youtube ne sera générée car <strong>{{ group.owner }}</strong> n'a pas lié son compte Youtube.</small>
         {% endif %}
     </p>
     {% form form %}
diff --git a/game/views.py b/game/views.py
index 20fedff..45685aa 100644
--- a/game/views.py
+++ b/game/views.py
@@ -331,9 +331,8 @@ class GameCreateView(LoginRequiredMixin, CreateView):
                 game=form.instance, player=player, music_video=music, order=order
             )
 
-        if models.YoutubeCredentials.objects.filter(user=self.request.user).exists():
-            form.instance.playlist_loading = True
-            form.instance.save()
+        form.instance.playlist_loading = True
+        form.instance.save()
         return res