diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
index a2edf29b96..745ad6a426 100644
--- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
+++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
@@ -108,6 +108,10 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
             String userId;
             DBASession authSession;
             if (configMode) {
+                if (webSession.getUser() != null) {
+                    // Already logged in - remove auth token
+                    webSession.removeAuthInfo(providerId);
+                }
                 if (authProviderExternal != null) {
                     userId = authProviderExternal.validateLocalAuth(
                         webSession.getProgressMonitor(),