diff --git a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls
index a79e868dea..96c559a0bf 100644
--- a/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls
+++ b/server/bundles/io.cloudbeaver.service.auth/schema/service.auth.graphqls
@@ -27,7 +27,7 @@ type AuthProviderInfo {
 
     #configurationParameters: [ObjectPropertyInfo]!
 
-    credentialParameters: [AuthCredentialInfo]!
+    credentialParameters: [AuthCredentialInfo!]!
 }
 
 type UserAuthInfo {
@@ -52,6 +52,6 @@ extend type Query {
 
     sessionUser: UserAuthInfo
 
-    authProviders: [AuthProviderInfo]!
+    authProviders: [AuthProviderInfo!]!
 
 }
diff --git a/webapp/packages/core/codegen.yml b/webapp/packages/core/codegen.yml
index 4b0b448234..857ed8b067 100644
--- a/webapp/packages/core/codegen.yml
+++ b/webapp/packages/core/codegen.yml
@@ -24,7 +24,8 @@ generates:
         object: false
       maybeValue: T
       scalars:
-        Object: "{ [key: string]: any }"
+        Object: any
+        JSON: "{ [key: string]: any }"
         DateTime: any
 hooks:
   afterAllFileWrite:
diff --git a/webapp/packages/core/src/sdk/sdk.ts b/webapp/packages/core/src/sdk/sdk.ts
index 7ad1294503..bebdd4e831 100644
--- a/webapp/packages/core/src/sdk/sdk.ts
+++ b/webapp/packages/core/src/sdk/sdk.ts
@@ -10,7 +10,7 @@ export type Scalars = {
   Boolean: boolean;
   Int: number;
   Float: number;
-  Object: { [key: string]: any };
+  Object: any;
   DateTime: any;
 };
 
@@ -18,7 +18,7 @@ export type Scalars = {
 export type Query = {
   authLogin: UserAuthInfo;
   authLogout?: Maybe<Scalars['Boolean']>;
-  authProviders: Array<Maybe<AuthProviderInfo>>;
+  authProviders: Array<AuthProviderInfo>;
   connectionState: ConnectionInfo;
   dataSourceList: Array<DataSourceInfo>;
   dataTransferAvailableStreamProcessors: Array<DataTransferProcessorInfo>;
@@ -560,7 +560,7 @@ export type AuthProviderInfo = {
   icon?: Maybe<Scalars['ID']>;
   description?: Maybe<Scalars['String']>;
   defaultProvider?: Maybe<Scalars['Boolean']>;
-  credentialParameters: Array<Maybe<AuthCredentialInfo>>;
+  credentialParameters: Array<AuthCredentialInfo>;
 };
 
 export type UserAuthInfo = {
@@ -741,10 +741,10 @@ export type AuthLogoutQuery = Pick<Query, 'authLogout'>;
 export type GetAuthProvidersQueryVariables = {};
 
 
-export type GetAuthProvidersQuery = { providers: Array<Maybe<(
+export type GetAuthProvidersQuery = { providers: Array<(
     Pick<AuthProviderInfo, 'id' | 'label' | 'icon' | 'description' | 'defaultProvider'>
-    & { credentialParameters: Array<Maybe<Pick<AuthCredentialInfo, 'id' | 'displayName' | 'description' | 'admin' | 'user' | 'possibleValues' | 'encryption'>>> }
-  )>>; };
+    & { credentialParameters: Array<Pick<AuthCredentialInfo, 'id' | 'displayName' | 'description' | 'admin' | 'user' | 'possibleValues' | 'encryption'>> }
+  )>; };
 
 export type GetSessionUserQueryVariables = {};