diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
index 3b9af2b44c..f964a45cfa 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java
@@ -254,18 +254,24 @@ public class WebSession extends BaseWebSession
     }
 
     // Note: for admin use only
-    public synchronized void resetUserState() throws DBException {
+    public synchronized void resetUserState(boolean needResetUserCache) throws DBException {
         clearAuthTokens();
-        try {
-            resetSessionCache();
-        } catch (DBCException e) {
-            addSessionError(e);
-            log.error(e);
+        if (needResetUserCache) {
+            try {
+                resetSessionCache();
+            } catch (DBCException e) {
+                addSessionError(e);
+                log.error(e);
+            }
         }
         refreshUserData();
         clearSessionContext();
     }
 
+    public synchronized void resetUserState() throws DBException {
+        resetUserState(true);
+    }
+
     @NotNull
     public DBPEventListener getDataSourceConnectListener() {
         return connectListener;
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java
index ecf33036da..0c6e80569f 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java
@@ -74,7 +74,7 @@ public class WebSessionAuthProcessor {
             }
         } catch (Exception e) {
             if (resetUserStateOnError) {
-                webSession.resetUserState();
+                webSession.resetUserState(false);
             }
             throw new DBException(e.getMessage(), e);
         }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java
index e4c125cc78..1b2a3d60bd 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/graphql/GraphQLLoggerUtil.java
@@ -27,6 +27,7 @@ import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.qm.QMConstants;
 import org.jkiss.utils.CommonUtils;
 
 import java.lang.reflect.Method;
@@ -46,8 +47,11 @@ public class GraphQLLoggerUtil {
             return null;
         }
         String userId = session.getUserContext().getUserId();
-        if (userId == null && session.getUserContext().isAuthorizedInSecurityManager()) {
-            return "anonymous";
+        if (userId == null) {
+            if (session.getUserContext().isAuthorizedInSecurityManager()) {
+                return QMConstants.QM_ANONYMOUS_DOMAIN;
+            }
+            return QMConstants.QM_UNAUTHORIZED_DOMAIN;
         }
         return userId;
     }