diff --git a/ApiDto/Requests/CreateUserRequest.cs b/ApiDto/Requests/CreateUserRequest.cs
index e1b3a4c..2d6fecf 100644
--- a/ApiDto/Requests/CreateUserRequest.cs
+++ b/ApiDto/Requests/CreateUserRequest.cs
@@ -11,17 +11,20 @@ public class CreateUserRequest
     /// Gets or sets the email address of the user.
     /// </summary>
     [Required]
+    [EmailAddress]
     public required string Email { get; set; }
 
     /// <summary>
     /// Gets or sets the username of the user.
     /// </summary>
     [Required]
+    [MinLength(2)]
     public required string Username { get; set; }
 
     /// <summary>
     /// Gets or sets the password of the user.
     /// </summary>
     [Required]
+    [MinLength(2)]
     public required string Password { get; set; }
 }
diff --git a/Endpoint/Controllers/Configuration/SetupController.cs b/Endpoint/Controllers/Configuration/SetupController.cs
index e92ca2b..2d64f7d 100644
--- a/Endpoint/Controllers/Configuration/SetupController.cs
+++ b/Endpoint/Controllers/Configuration/SetupController.cs
@@ -29,7 +29,6 @@ using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
-using System.Net.Mail;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Cryptography;
@@ -305,10 +304,6 @@ public class SetupController(
     public ActionResult<string> CreateAdmin([FromBody] CreateUserRequest userRequest)
     {
         new PasswordPolicyService(GeneralConfig.PasswordPolicy).ValidatePasswordOrThrow(userRequest.Password);
-
-        if (!MailAddress.TryCreate(userRequest.Email, out _))
-            throw new ControllerArgumentException("The email address is incorrect.");
-
         var (salt, hash) = passwordHashService.HashPassword(userRequest.Password);
 
         var admin = new Admin