diff --git a/Watcher/ViewModels/EditServerViewModel.cs b/Watcher/ViewModels/EditServerViewModel.cs
index 9345f6e..d708a48 100644
--- a/Watcher/ViewModels/EditServerViewModel.cs
+++ b/Watcher/ViewModels/EditServerViewModel.cs
@@ -7,14 +7,14 @@ namespace Watcher.ViewModels
         public int Id { get; set; }
 
         [Required(ErrorMessage = "Name ist erforderlich")]
-        public string? Name { get; set; }
+        public required string Name { get; set; }
 
         [Required(ErrorMessage = "IP-Adresse ist erforderlich")]
         [RegularExpression(@"^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$", ErrorMessage = "Ungültige IP-Adresse")]
         public required string IPAddress { get; set; }
 
         [Required(ErrorMessage = "Typ ist erforderlich")]
-        public string? Type { get; set; }
+        public required string Type { get; set; }
 
         // Hardware Measurment Warning/Crit Values
         public double CPU_Load_Warning { get; set; } = 75.0;
diff --git a/Watcher/ViewModels/EditUserViewModel.cs b/Watcher/ViewModels/EditUserViewModel.cs
index 30e3fe4..b83df00 100644
--- a/Watcher/ViewModels/EditUserViewModel.cs
+++ b/Watcher/ViewModels/EditUserViewModel.cs
@@ -5,7 +5,7 @@ namespace Watcher.ViewModels;
 public class EditUserViewModel
 {
     [Required]
-    public string? Username { get; set; }
+    public required string Username { get; set; }
 
     [Required]
     [DataType(DataType.Password)]