diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml
index 55fee3b..046d90a 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml
+++ b/TheGameExtreme/view/GamePreparationPage.xaml
@@ -57,7 +57,7 @@
         <ScrollView
             Grid.Row="2"
             Grid.Column="1"
-            Margin="50,20,50,0">
+            Margin="50,0,50,0">
 
             <StackLayout
                 x:Name="NameList">
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs
index ffddac3..7235f22 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml.cs
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs
@@ -43,6 +43,11 @@ namespace TheGameExtreme.view
             for (int i = 0; i < NameList.Children.Count; i++)
             {
                 playersNames.Add(((Entry)NameList.Children[i]).Text);
+                if (string.IsNullOrWhiteSpace(playersNames[playersNames.Count - 1]))
+                {
+                    DisplayAlert("Erreur Pseudo", "Veuillez remplir tous les pseudos", "OK");
+                    return;
+                }
             }
             
             await Navigation.PushAsync(new MainPage(playersNames));