diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java
index 415bd76809..b24f6e56a2 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebAuthProviderDescriptor.java
@@ -110,4 +110,8 @@ public class WebAuthProviderDescriptor extends AbstractDescriptor {
         return instance;
     }
 
+    @Override
+    public String toString() {
+        return getId();
+    }
 }
diff --git a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
index 1cd742b847..b8a3990bd1 100644
--- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
@@ -17,6 +17,7 @@
 package io.cloudbeaver.service.admin.impl;
 
 import io.cloudbeaver.DBWebException;
+import io.cloudbeaver.auth.provider.local.LocalAuthProvider;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.user.WebRole;
 import io.cloudbeaver.model.user.WebUser;
@@ -207,6 +208,11 @@ public class WebServiceAdmin implements DBWServiceAdmin {
         if (authProvider == null) {
             throw new DBWebException("Invalid auth provider '" + providerId + "'");
         }
+        // Check userId credential.
+        // FIXME: It is actually a hack. All crdentials must be passed from client
+        if (LocalAuthProvider.PROVIDER_ID.equals(providerId)) {
+            credentials.put(LocalAuthProvider.CRED_USER, userID);
+        }
         try {
             CBPlatform.getInstance().getApplication().getSecurityController().setUserCredentials(userID, authProvider, credentials);
             return true;