1 files changed, 5 insertions, 7 deletions
diff --git a/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs
index 81c507d..44b8376 100644
--- a/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs
+++ b/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs
@@ -24,19 +24,17 @@ public class CreateAccountRoute : RouteBaseAsync.WithRequest<CreateAccountRoute.
     [HttpPost("~/_/account/create")]
     public override async Task<ActionResult> HandleAsync(Payload request, CancellationToken cancellationToken = default) {
         var problem = new KnownProblemModel();
-        if (request.Username.IsValidEmailAddress() == false) {
-            problem.AddError("username", _localizer["{0} does not look like a valid email", request.Username]);
+        var username = request.Username.Trim();
+        if (username.IsValidEmailAddress() == false) {
+            problem.AddError("username", _localizer["{0} does not look like a valid email", username]);
+        } else if (_database.Users.FirstOrDefault(c => c.Username == username) != default) {
+            problem.AddError("username", _localizer["There is already a user registered with username: {0}", username]);
         }
 
         if (request.Password.Length < 6) {
             problem.AddError("password", _localizer["The password requires 6 or more characters."]);
         }
 
-        var username = request.Username.Trim();
-        if (problem.Errors.All(p => p.Key != "username") && _database.Users.Any(c => c.Username == username)) {
-            problem.AddError("username", _localizer["There is already a user registered with username: {0}", username]);
-        }
-
         if (problem.Errors.Any()) {
             problem.Title = _localizer["Invalid form"];
             problem.Subtitle = _localizer["One or more fields is invalid"];