diff --git a/modules/Users/src/SimpleModule.Users/Pages/Account/UnlockAccountEndpoint.cs b/modules/Users/src/SimpleModule.Users/Pages/Account/UnlockAccountEndpoint.cs
index 971561fe..411fcfd2 100644
--- a/modules/Users/src/SimpleModule.Users/Pages/Account/UnlockAccountEndpoint.cs
+++ b/modules/Users/src/SimpleModule.Users/Pages/Account/UnlockAccountEndpoint.cs
@@ -76,8 +76,16 @@ static IResult InvalidLink() =>
 
                     user.LockoutEnd = null;
                     user.AccessFailedCount = 0;
-                    await userManager.UpdateAsync(user);
-                    await userManager.UpdateSecurityStampAsync(user);
+                    var updateResult = await userManager.UpdateAsync(user);
+                    if (!updateResult.Succeeded)
+                    {
+                        return InvalidLink();
+                    }
+                    var stampResult = await userManager.UpdateSecurityStampAsync(user);
+                    if (!stampResult.Succeeded)
+                    {
+                        return InvalidLink();
+                    }
 
                     await bus.PublishAsync(
                         new UserSelfUnlockedEvent(UserId.From(user.Id), user.Email ?? string.Empty)