diff --git a/Sources/Stim.Model/User.cs b/Sources/Stim.Model/User.cs
index abf7396..ebbf63d 100644
--- a/Sources/Stim.Model/User.cs
+++ b/Sources/Stim.Model/User.cs
@@ -41,7 +41,7 @@ namespace Model
             private set
             {
                 Regex rg_email = new Regex("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$");
-                if (rg_email.IsMatch(value))
+                if (value != null && rg_email.IsMatch(value))
                     email = value;
                 return;
             }
@@ -54,7 +54,7 @@ namespace Model
             private set
             {
                 Regex rg = new Regex("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,32}$");
-                if (!rg.IsMatch(value)) return;
+                if (value==null || !rg.IsMatch(value)) return;
                 password = value;
             }
         }
diff --git a/Sources/TestProject1/TestUser.cs b/Sources/TestProject1/TestUser.cs
index e8ac696..ec4867c 100644
--- a/Sources/TestProject1/TestUser.cs
+++ b/Sources/TestProject1/TestUser.cs
@@ -23,8 +23,42 @@ namespace Test
             Assert.Null(user.Username);
 
             User user2 = new(null, "biographie", "adresse.mail@gmail.com", "Azerty123*");
-            Assert.Null(user.Username);
+            Assert.Null(user2.Username);
         }
+
+        /*[Fact]
+        public void Biographie()
+        {
+            User user = new("username", "", "adresse.mail@gmail.com", "Azerty123*");
+            Assert.Null(user.Biographie);
+
+            User user2 = new("username", null, "adresse.mail@gmail.com", "Azerty123*");
+            Assert.Null(user2.Biographie);
+        }*/
+
+        [Fact]
+        public void Email()
+        {
+            User user = new("username", "biographie", "", "Azerty123*");
+            Assert.Null(user.Email);
+
+            User user2 = new("username", "biographie", null, "Azerty123*");
+            Assert.Null(user2.Email);
+        }
+
+        [Fact]
+        public void Password()
+        {
+            User user = new("username", "biographie", "adresse.mail@gmail.com", "");
+            Assert.Null(user.Password);
+
+            User user2 = new("username", "biographie", "adresse.mail@gmail.com", null);
+            Assert.Null(user2.Password);
+
+            User user3 = new("username", "biographie", "adresse.mail@gmail.com", "54az6e");
+            Assert.Null(user3.Password);
+        }
+
         [Fact]
         public void AddingAndAddingGameToFollowed()
         {
@@ -39,6 +73,7 @@ namespace Test
             user.RemoveAGame(game);
             Assert.Empty(user.Followed_Games);
         }
+
         /*
         [Fact]
         public void ReviewAddingAndRemovingFromAGameViaUser()