diff --git a/LeaderboardBackend/Controllers/UsersController.cs b/LeaderboardBackend/Controllers/UsersController.cs
index 0ff2a3a9..47baa4b5 100644
--- a/LeaderboardBackend/Controllers/UsersController.cs
+++ b/LeaderboardBackend/Controllers/UsersController.cs
@@ -50,29 +50,19 @@ public async Task<ActionResult<UserViewModel>> GetUserById(Guid id)
     ///     Example: `{ 'Authorization': 'Bearer JWT' }`.
     /// </remarks>
     /// <response code="200">The `User` was found and returned successfully..</response>
-    /// <response code="403">An invalid JWT was passed in.</response>
+    /// <response code="401">An invalid JWT was passed in.</response>
+    /// <response code="404">The user was not found in the database.</response>
     [HttpGet("me")]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
+    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    [ApiConventionMethod(typeof(Conventions), nameof(Conventions.Get))]
     public async Task<ActionResult<UserViewModel>> Me()
     {
-        // FIXME: Use ApiConventionMethod here! - Ero
-
-        string? email = _authService.GetEmailFromClaims(HttpContext.User);
-
-        if (email is null)
-        {
-            return Forbid();
-        }
-
-        User? user = await _userService.GetUserByEmail(email);
-
-        // FIXME: Should return NotFound()! - Ero
-        if (user is null)
-        {
-            return Forbid();
-        }
-
-        return Ok(UserViewModel.MapFrom(user));
+        return (await _userService.GetUserFromClaims(HttpContext.User)).Match<ActionResult<UserViewModel>>(
+            user => Ok(UserViewModel.MapFrom(user)),
+            badCredentials => Unauthorized(),
+            userNotFound => NotFound()
+        );
     }
 }
diff --git a/LeaderboardBackend/openapi.json b/LeaderboardBackend/openapi.json
index 95aa114e..5b4f9b6a 100644
--- a/LeaderboardBackend/openapi.json
+++ b/LeaderboardBackend/openapi.json
@@ -1047,7 +1047,7 @@
               }
             }
           },
-          "403": {
+          "401": {
             "description": "An invalid JWT was passed in.",
             "content": {
               "application/json": {
@@ -1056,6 +1056,16 @@
                 }
               }
             }
+          },
+          "404": {
+            "description": "The user was not found in the database.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ProblemDetails"
+                }
+              }
+            }
           }
         }
       }