diff --git a/packages/auth/src/vpu-auth.js b/packages/auth/src/vpu-auth.js
index 677a7d103a76f0666961b79e4fe319de4441cd62..a34609ee61e16b99351b3b9227eeff399b9c9742 100644
--- a/packages/auth/src/vpu-auth.js
+++ b/packages/auth/src/vpu-auth.js
@@ -68,7 +68,7 @@ class VPUAuth extends LitElement {
         }
 
         // load Keycloak if we want to force the login or if we were redirected from the Keycloak login page
-        if (this.forceLogin || (href.indexOf('#state=') > 0 && href.indexOf('&session_state=') > 0)) {
+        if (this.forceLogin || (href.search('[&#]state=') >= 0 && href.search('[&#]session_state=') >= 0)) {
             this.loadKeycloak();
         }