diff --git a/backend/src/Squidex.Domain.Users/UserValues.cs b/backend/src/Squidex.Domain.Users/UserValues.cs
index 21fea3f1b..aec00352a 100644
--- a/backend/src/Squidex.Domain.Users/UserValues.cs
+++ b/backend/src/Squidex.Domain.Users/UserValues.cs
@@ -97,9 +97,14 @@ namespace Squidex.Domain.Users
 
             if (CustomClaims != null)
             {
-                foreach (var claim in CustomClaims)
+                foreach (var group in CustomClaims.GroupBy(x => x.Type))
                 {
-                    SyncString(claim.Type, claim.Value);
+                    RemoveClaims(x => x.Type == group.Key);
+
+                    foreach (var claim in group)
+                    {
+                        AddClaim(claim.Type, claim.Value);
+                    }
                 }
             }