diff --git a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
index 6a9bd418f..fba4d5144 100644
--- a/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
+++ b/packages/ui/certd-server/src/controller/basic/login/oauth-controller.ts
@@ -169,7 +169,7 @@ export class ConnectController extends BaseController {
     const userInfo = validationValue.userInfo;
     const oauthType = validationValue.type;
     let newUser = new UserEntity()
-    newUser.username = `${oauthType}_${userInfo.nickName}_${simpleNanoId(6)}`;
+    newUser.username = `${userInfo.nickName}_${simpleNanoId(6)}_${oauthType}`;
     newUser.avatar = userInfo.avatar;
     newUser.nickName = userInfo.nickName || simpleNanoId(6);
 
diff --git a/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts b/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts
index b07392a57..dbbc7b35a 100644
--- a/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-oauth/oidc/plugin-oidc.ts
@@ -127,7 +127,7 @@ export class OidcOauthProvider extends BaseAddon implements IOauthProvider {
       },
       userInfo: {
         openId: claims.sub,
-        nickName: claims.nickname || claims.preferred_username || "",
+        nickName: claims.nickname || claims.name || claims.username || claims.preferred_username || "",
         avatar: claims.picture,
       },
     }