diff --git a/Directory.Packages.props b/Directory.Packages.props
index 666d4c7abf5..bd9e1fabdaf 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,14 +12,14 @@
 
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.1.2" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.310.2" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.310.7" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
     <PackageVersion Include="Azure.Identity" Version="1.12.0" />
-    <PackageVersion Include="Azure.Search.Documents" Version="11.5.1" />
-    <PackageVersion Include="Azure.Storage.Blobs" Version="12.20.0" />
+    <PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
+    <PackageVersion Include="Azure.Storage.Blobs" Version="12.21.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.0.2" />
@@ -38,18 +38,18 @@
     <PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
     <PackageVersion Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
     <PackageVersion Include="Lucene.Net.Spatial" Version="4.8.0-beta00016" />
-    <PackageVersion Include="MailKit" Version="4.7.0" />
+    <PackageVersion Include="MailKit" Version="4.7.1.1" />
     <PackageVersion Include="Markdig" Version="0.37.0" />
     <PackageVersion Include="MessagePack" Version="2.2.60" />
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.4" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
-    <PackageVersion Include="Microsoft.Identity.Web" Version="2.20.0" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="3.0.0" />
 
     <!--
       Important: the version of the Microsoft.IdentityModel.Protocols.OpenIdConnect package MUST
       match the IdentityModel version transitively referenced by OpenIddict to ensure we don't
       accidentally end up referencing inconsistent versions (which is not supported by IM).
-
+ 
       See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
     -->
 
@@ -61,7 +61,7 @@
     <PackageVersion Include="Moq" Version="4.20.70" />
     <PackageVersion Include="ncrontab" Version="3.3.3" />
     <PackageVersion Include="NEST" Version="7.17.5" />
-    <PackageVersion Include="NJsonSchema" Version="11.0.1" />
+    <PackageVersion Include="NJsonSchema" Version="11.0.2" />
     <PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.11" />
     <PackageVersion Include="NodaTime" Version="3.1.11" />
     <PackageVersion Include="OpenIddict.Core" Version="5.7.0" />
@@ -81,9 +81,9 @@
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
-    <PackageVersion Include="xunit" Version="2.8.1" />
-    <PackageVersion Include="xunit.analyzers" Version="1.14.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.15.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="YesSql" Version="5.0.0" />
     <PackageVersion Include="YesSql.Abstractions" Version="5.0.0" />
     <PackageVersion Include="YesSql.Core" Version="5.0.0" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
index 4b2f714f74e..6dcf4adf19d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
@@ -15,7 +15,6 @@
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.IdentityModel.Tokens;
 using OrchardCore.ContentManagement;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.ModelBinding;
@@ -29,6 +28,7 @@
 using OrchardCore.Users.Models;
 using OrchardCore.Users.Services;
 using OrchardCore.Users.ViewModels;
+using YesSql.Services;
 using SignInResult = Microsoft.AspNetCore.Identity.SignInResult;
 
 namespace OrchardCore.Users.Controllers
@@ -810,13 +810,13 @@ public static async Task<bool> UpdateUserPropertiesAsync(UserManager<IUser> user
                 userNeedUpdate = !JsonNode.DeepEquals(currentProperties, user.Properties);
             }
 
-            var currentClaims = user.UserClaims.
-            Where(x => !x.ClaimType.IsNullOrEmpty()).
-            DistinctBy(x => new { x.ClaimType, x.ClaimValue }).
-            ToList();
+            var currentClaims = user.UserClaims
+                .Where(x => !string.IsNullOrEmpty(x.ClaimType))
+                .DistinctBy(x => new { x.ClaimType, x.ClaimValue })
+                .ToList();
 
             var claimsChanged = false;
-            if (context.ClaimsToRemove != null)
+            if (context.ClaimsToRemove?.Count > 0)
             {
                 var claimsToRemove = context.ClaimsToRemove.ToHashSet();
                 foreach (var item in claimsToRemove)
@@ -830,7 +830,7 @@ public static async Task<bool> UpdateUserPropertiesAsync(UserManager<IUser> user
                 }
             }
 
-            if (context.ClaimsToUpdate != null)
+            if (context.ClaimsToUpdate?.Count > 0)
             {
                 foreach (var item in context.ClaimsToUpdate)
                 {