diff --git a/src/Squidex.Infrastructure/Security/Extensions.cs b/src/Squidex.Infrastructure/Security/Extensions.cs
index bb25956c6..b6b5e93f5 100644
--- a/src/Squidex.Infrastructure/Security/Extensions.cs
+++ b/src/Squidex.Infrastructure/Security/Extensions.cs
@@ -19,14 +19,14 @@ namespace Squidex.Infrastructure.Security
 
             if (!string.IsNullOrWhiteSpace(subjectId))
             {
-                return new RefToken(subjectId, RefTokenType.Subject);
+                return new RefToken(RefTokenType.Subject, subjectId);
             }
 
             var clientId = principal.OpenIdClientId();
 
             if (!string.IsNullOrWhiteSpace(clientId))
             {
-                return new RefToken(clientId, RefTokenType.Client);
+                return new RefToken(RefTokenType.Client, clientId);
             }
 
             return null;