diff --git a/backend/src/Squidex.Domain.Users/UserValues.cs b/backend/src/Squidex.Domain.Users/UserValues.cs
index aec00352a..f1bd1a763 100644
--- a/backend/src/Squidex.Domain.Users/UserValues.cs
+++ b/backend/src/Squidex.Domain.Users/UserValues.cs
@@ -95,19 +95,6 @@ namespace Squidex.Domain.Users
             SyncBoolean(SquidexClaimTypes.Consent, Consent);
             SyncBoolean(SquidexClaimTypes.ConsentForEmails, ConsentForEmails);
 
-            if (CustomClaims != null)
-            {
-                foreach (var group in CustomClaims.GroupBy(x => x.Type))
-                {
-                    RemoveClaims(x => x.Type == group.Key);
-
-                    foreach (var claim in group)
-                    {
-                        AddClaim(claim.Type, claim.Value);
-                    }
-                }
-            }
-
             if (Permissions != null)
             {
                 RemoveClaims(x => x.Type == SquidexClaimTypes.Permissions);
@@ -128,6 +115,19 @@ namespace Squidex.Domain.Users
                 }
             }
 
+            if (CustomClaims != null)
+            {
+                foreach (var group in CustomClaims.GroupBy(x => x.Type))
+                {
+                    RemoveClaims(x => x.Type == group.Key);
+
+                    foreach (var claim in group)
+                    {
+                        AddClaim(claim.Type, claim.Value);
+                    }
+                }
+            }
+
             if (claimsToRemove.Count > 0)
             {
                 var result = await userManager.RemoveClaimsAsync(user, claimsToRemove);
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateWorkflowDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateWorkflowDto.cs
index 169134839..cac16339f 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateWorkflowDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Apps/Models/UpdateWorkflowDto.cs
@@ -35,6 +35,7 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models
         /// <summary>
         /// The initial step.
         /// </summary>
+        [Required]
         public Status Initial { get; set; }
 
         public UpdateWorkflow ToCommand(Guid id)