diff --git a/Jellyfin.Api/Controllers/UserController.cs b/Jellyfin.Api/Controllers/UserController.cs
index 568224a424..06f2227b83 100644
--- a/Jellyfin.Api/Controllers/UserController.cs
+++ b/Jellyfin.Api/Controllers/UserController.cs
@@ -277,7 +277,7 @@ namespace Jellyfin.Api.Controllers
             }
             else
             {
-                if (!User.IsInRole(UserRoles.Administrator))
+                if (!User.IsInRole(UserRoles.Administrator) || User.GetUserId().Equals(userId))
                 {
                     var success = await _userManager.AuthenticateUser(
                         user.Username,