diff --git a/plugins/auth-backend/src/providers/bitbucket/provider.ts b/plugins/auth-backend/src/providers/bitbucket/provider.ts
index c83a195db5..630c5c61e3 100644
--- a/plugins/auth-backend/src/providers/bitbucket/provider.ts
+++ b/plugins/auth-backend/src/providers/bitbucket/provider.ts
@@ -222,7 +222,7 @@ export const bitbucketUsernameSignInResolver: SignInResolver<BitbucketOAuthResul
     const claims = getEntityClaims(entity);
     const token = await ctx.tokenIssuer.issueToken({ claims });
 
-    return { id: entity.metadata.name, entity, token };
+    return { id: `user:default/${entity.metadata.name}`, entity, token };
   };
 
 export const bitbucketUserIdSignInResolver: SignInResolver<BitbucketOAuthResult> =
@@ -242,7 +242,7 @@ export const bitbucketUserIdSignInResolver: SignInResolver<BitbucketOAuthResult>
     const claims = getEntityClaims(entity);
     const token = await ctx.tokenIssuer.issueToken({ claims });
 
-    return { id: entity.metadata.name, entity, token };
+    return { id: `user:default/${entity.metadata.name}`, entity, token };
   };
 
 export type BitbucketProviderOptions = {
diff --git a/plugins/auth-backend/src/providers/github/provider.ts b/plugins/auth-backend/src/providers/github/provider.ts
index c5ccdb2d59..220ec4fcce 100644
--- a/plugins/auth-backend/src/providers/github/provider.ts
+++ b/plugins/auth-backend/src/providers/github/provider.ts
@@ -191,7 +191,10 @@ export const githubDefaultSignInResolver: SignInResolver<GithubOAuthResult> =
     const userId = fullProfile.username || fullProfile.id;
 
     const token = await ctx.tokenIssuer.issueToken({
-      claims: { sub: userId, ent: [`user:default/${userId}`] },
+      claims: {
+        sub: `user:default/${userId}`,
+        ent: [`user:default/${userId}`],
+      },
     });
 
     return { id: userId, token };
diff --git a/plugins/auth-backend/src/providers/gitlab/provider.ts b/plugins/auth-backend/src/providers/gitlab/provider.ts
index 28deb458d9..5454065847 100644
--- a/plugins/auth-backend/src/providers/gitlab/provider.ts
+++ b/plugins/auth-backend/src/providers/gitlab/provider.ts
@@ -72,7 +72,7 @@ export const gitlabDefaultSignInResolver: SignInResolver<OAuthResult> = async (
   }
 
   const token = await ctx.tokenIssuer.issueToken({
-    claims: { sub: id, ent: [`user:default/${id}`] },
+    claims: { sub: `user:default/${id}`, ent: [`user:default/${id}`] },
   });
 
   return { id, token };
diff --git a/plugins/auth-backend/src/providers/google/provider.ts b/plugins/auth-backend/src/providers/google/provider.ts
index 90e68c6f9c..11397b5102 100644
--- a/plugins/auth-backend/src/providers/google/provider.ts
+++ b/plugins/auth-backend/src/providers/google/provider.ts
@@ -198,7 +198,7 @@ export const googleEmailSignInResolver: SignInResolver<OAuthResult> = async (
   const claims = getEntityClaims(entity);
   const token = await ctx.tokenIssuer.issueToken({ claims });
 
-  return { id: entity.metadata.name, entity, token };
+  return { id: `user:default/${entity.metadata.name}`, entity, token };
 };
 
 const googleDefaultSignInResolver: SignInResolver<OAuthResult> = async (
diff --git a/plugins/auth-backend/src/providers/microsoft/provider.ts b/plugins/auth-backend/src/providers/microsoft/provider.ts
index c45e152581..c1158ba2d3 100644
--- a/plugins/auth-backend/src/providers/microsoft/provider.ts
+++ b/plugins/auth-backend/src/providers/microsoft/provider.ts
@@ -217,7 +217,7 @@ export const microsoftEmailSignInResolver: SignInResolver<OAuthResult> = async (
   const claims = getEntityClaims(entity);
   const token = await ctx.tokenIssuer.issueToken({ claims });
 
-  return { id: entity.metadata.name, entity, token };
+  return { id: `user:default/${entity.metadata.name}`, entity, token };
 };
 
 export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> =
@@ -231,7 +231,10 @@ export const microsoftDefaultSignInResolver: SignInResolver<OAuthResult> =
     const userId = profile.email.split('@')[0];
 
     const token = await ctx.tokenIssuer.issueToken({
-      claims: { sub: userId, ent: [`user:default/${userId}`] },
+      claims: {
+        sub: `user:default/${userId}`,
+        ent: [`user:default/${userId}`],
+      },
     });
 
     return { id: userId, token };
diff --git a/plugins/auth-backend/src/providers/oauth2/provider.ts b/plugins/auth-backend/src/providers/oauth2/provider.ts
index 550b88b004..ec777c231b 100644
--- a/plugins/auth-backend/src/providers/oauth2/provider.ts
+++ b/plugins/auth-backend/src/providers/oauth2/provider.ts
@@ -211,7 +211,7 @@ export const oAuth2DefaultSignInResolver: SignInResolver<OAuthResult> = async (
   const userId = profile.email.split('@')[0];
 
   const token = await ctx.tokenIssuer.issueToken({
-    claims: { sub: userId, ent: [`user:default/${userId}`] },
+    claims: { sub: `user:default/${userId}`, ent: [`user:default/${userId}`] },
   });
 
   return { id: userId, token };
diff --git a/plugins/auth-backend/src/providers/okta/provider.ts b/plugins/auth-backend/src/providers/okta/provider.ts
index a5c663ae68..31caafed14 100644
--- a/plugins/auth-backend/src/providers/okta/provider.ts
+++ b/plugins/auth-backend/src/providers/okta/provider.ts
@@ -219,7 +219,7 @@ export const oktaEmailSignInResolver: SignInResolver<OAuthResult> = async (
   const claims = getEntityClaims(entity);
   const token = await ctx.tokenIssuer.issueToken({ claims });
 
-  return { id: entity.metadata.name, entity, token };
+  return { id: `user:default/${entity.metadata.name}`, entity, token };
 };
 
 export const oktaDefaultSignInResolver: SignInResolver<OAuthResult> = async (
@@ -236,7 +236,7 @@ export const oktaDefaultSignInResolver: SignInResolver<OAuthResult> = async (
   const userId = profile.email.split('@')[0];
 
   const token = await ctx.tokenIssuer.issueToken({
-    claims: { sub: userId, ent: [`user:default/${userId}`] },
+    claims: { sub: `user:default/${userId}`, ent: [`user:default/${userId}`] },
   });
 
   return { id: userId, token };