diff --git a/api/login.go b/api/login.go
index f69c875bb..2477adfbe 100644
--- a/api/login.go
+++ b/api/login.go
@@ -511,6 +511,8 @@ func claimOidcUserInfo(userInfo *oidc.UserInfo, provider util.OidcProvider) (res
 		return
 	}
 
+	prepareClaims(claims)
+
 	return parseClaims(claims, provider)
 }
 
@@ -521,6 +523,8 @@ func claimOidcToken(idToken *oidc.IDToken, provider util.OidcProvider) (res oidc
 		return
 	}
 
+	prepareClaims(claims)
+
 	return parseClaims(claims, provider)
 }