diff --git a/API/Controllers/Admin/UsersAdminController.cs b/API/Controllers/Admin/UsersAdminController.cs
index 10d6a2d..2a97f6c 100644
--- a/API/Controllers/Admin/UsersAdminController.cs
+++ b/API/Controllers/Admin/UsersAdminController.cs
@@ -120,7 +120,7 @@ public class UsersAdminController(IUserService service, ILogger<UsersAdminContro
         }
         catch (ServiceException e)
         {
-            return BadRequest(e.Failures);
+            return BadRequest(e.FailuresMessages());
         }
     }
 }
\ No newline at end of file
diff --git a/API/Controllers/UsersController.cs b/API/Controllers/UsersController.cs
index b6022f2..dbdc20a 100644
--- a/API/Controllers/UsersController.cs
+++ b/API/Controllers/UsersController.cs
@@ -54,16 +54,23 @@ public class UsersController(IUserService users, ITeamService teams, ITacticServ
     {
         var userId = accessor.CurrentUserId(HttpContext);
         var currentUser = (await users.GetUser(userId))!;
-        await users.UpdateUser(
-            new User(
-                userId,
-                req.Name ?? currentUser.Name,
-                req.Email ?? currentUser.Email,
-                req.ProfilePicture ?? currentUser.ProfilePicture,
-                currentUser.IsAdmin
-            ),
-            req.Password
-        );
+
+        try
+        {
+            await users.UpdateUser(
+                new User(
+                    userId,
+                    req.Name ?? currentUser.Name,
+                    req.Email ?? currentUser.Email,
+                    req.ProfilePicture ?? currentUser.ProfilePicture,
+                    currentUser.IsAdmin
+                ),
+                req.Password
+            );
+        } catch (ServiceException e)
+        {
+            return BadRequest(e.FailuresMessages());
+        }
 
 
         return Ok();
diff --git a/Services/ServiceException.cs b/Services/ServiceException.cs
index 0551c27..c42b6e8 100644
--- a/Services/ServiceException.cs
+++ b/Services/ServiceException.cs
@@ -10,4 +10,11 @@ public class ServiceException : Exception
     {
         Failures = new List<Failure>(failures);
     }
+
+    public Dictionary<string, string[]> FailuresMessages()
+    {
+        return Failures.GroupBy(f => f.Name)
+            .Select(f => (f.Key, f.Select(f => f.Message).ToArray()))
+            .ToDictionary();
+    }
 }
\ No newline at end of file