diff --git a/package-shared/functions/backend/cookies/get-auth-cookie-names.js b/package-shared/functions/backend/cookies/get-auth-cookie-names.js
index 4603d7a..9cecf42 100644
--- a/package-shared/functions/backend/cookies/get-auth-cookie-names.js
+++ b/package-shared/functions/backend/cookies/get-auth-cookie-names.js
@@ -17,7 +17,7 @@ module.exports = function getAuthCookieNames(params) {
         process.env.DSQL_COOKIES_ONE_TIME_CODE_NAME || "one-time-code";
 
     const targetDatabase =
-        params?.database ||
+        params?.database?.replace(/^datasquirel_user_\d+_/, "") ||
         process.env.DSQL_DB_NAME?.replace(/^datasquirel_user_\d+_/, "");
 
     let keyCookieName = cookiesPrefix;
diff --git a/package.json b/package.json
index fd48b3a..301e15e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "2.9.1",
+    "version": "2.9.2",
     "description": "Cloud-based SQL data management tool",
     "main": "index.js",
     "bin": {