2 files changed, 16 insertions, 12 deletions
diff --git a/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs
index 6b6e7bc..81c507d 100644
--- a/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs
+++ b/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs
@@ -23,22 +23,24 @@ public class CreateAccountRoute : RouteBaseAsync.WithRequest<CreateAccountRoute.
     [AllowAnonymous]
     [HttpPost("~/_/account/create")]
     public override async Task<ActionResult> HandleAsync(Payload request, CancellationToken cancellationToken = default) {
-        var errors = new Dictionary<string, string>();
+        var problem = new KnownProblemModel();
         if (request.Username.IsValidEmailAddress() == false) {
-            errors.Add("username", _localizer["{0} does not look like a valid email", request.Username]);
+            problem.AddError("username", _localizer["{0} does not look like a valid email", request.Username]);
         }
 
         if (request.Password.Length < 6) {
-            errors.Add("password", _localizer["The password requires 6 or more characters."]);
+            problem.AddError("password", _localizer["The password requires 6 or more characters."]);
         }
 
         var username = request.Username.Trim();
-        if (errors.All(p => p.Key != "username") && _database.Users.Any(c => c.Username == username)) {
-            errors.Add("username", _localizer["There is already a user registered with username: {0}", username]);
+        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 (errors.Any()) {
-            return KnownProblem(_localizer["Invalid form"], _localizer["You have invalid values"], errors);
+        if (problem.Errors.Any()) {
+            problem.Title = _localizer["Invalid form"];
+            problem.Subtitle = _localizer["One or more fields is invalid"];
+            return KnownProblem(problem);
         }
 
         var user = new User(username);
diff --git a/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs
index c8999e0..c75e750 100644
--- a/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs
+++ b/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs
@@ -31,10 +31,10 @@ public class UpdateAccountRoute : RouteBaseAsync.WithRequest<UpdateAccountRoute.
             return KnownProblem(_localizer["Invalid request"], _localizer["No data was submitted"]);
         }
 
-        var validationProblems = new Dictionary<string, string>();
+        var problem = new KnownProblemModel();
 
         if (request.Password.HasValue() && request.Password.Length < 6) {
-            validationProblems.Add("password", _localizer["The new password must contain at least 6 characters"]);
+            problem.AddError("password", _localizer["The new password must contain at least 6 characters"]);
         }
 
         if (request.Password.HasValue()) {
@@ -42,11 +42,13 @@ public class UpdateAccountRoute : RouteBaseAsync.WithRequest<UpdateAccountRoute.
         }
 
         if (request.Username.HasValue() && !request.Username.IsValidEmailAddress()) {
-            validationProblems.Add("username", _localizer["The new username does not look like a valid email address"]);
+            problem.AddError("username", _localizer["The new username does not look like a valid email address"]);
         }
 
-        if (validationProblems.Any()) {
-            return KnownProblem(_localizer["Validation problems"], _localizer["Your form has invalid values"], validationProblems);
+        if (problem.Errors.Any()) {
+            problem.Title = _localizer["Invalid form"];
+            problem.Subtitle = _localizer["One or more validation errors occured"];
+            return KnownProblem(problem);
         }
 
         if (request.Username.HasValue()) {