diff --git a/demo/vue-app-new/package-lock.json b/demo/vue-app-new/package-lock.json
index 0c1004386..98de66de1 100644
--- a/demo/vue-app-new/package-lock.json
+++ b/demo/vue-app-new/package-lock.json
@@ -9,53 +9,53 @@
       "version": "0.0.0",
       "dependencies": {
         "@solana/web3.js": "^1.98.4",
-        "@tanstack/vue-query": "^5.90.2",
-        "@toruslabs/base-controllers": "^8.7.0",
+        "@tanstack/vue-query": "^5.92.1",
+        "@toruslabs/base-controllers": "^8.10.0",
         "@toruslabs/bs58": "^1.0.0",
-        "@toruslabs/ethereum-controllers": "^8.7.0",
-        "@toruslabs/solana-controllers": "^8.7.0",
+        "@toruslabs/ethereum-controllers": "^8.10.0",
+        "@toruslabs/solana-controllers": "^8.10.0",
         "@toruslabs/tweetnacl-js": "^1.0.4",
         "@toruslabs/vue-components": "^8.1.2",
-        "@toruslabs/vue-icons": "^8.0.2",
+        "@toruslabs/vue-icons": "^8.0.4",
         "@wagmi/vue": "^0.2.11",
-        "@web3auth/auth": "^10.5.0",
+        "@web3auth/auth": "^10.8.0",
         "@web3auth/modal": "file:../../packages/modal",
         "@web3auth/no-modal": "file:../../packages/no-modal",
         "@web3auth/sign-in-with-ethereum": "^5.0.0",
-        "@web3auth/ws-embed": "^5.1.0",
-        "ethers": "^6.15.0",
-        "petite-vue-i18n": "^11.1.12",
-        "react": "^19.2.0",
-        "react-dom": "^19.2.0",
-        "vue": "^3.5.22"
+        "@web3auth/ws-embed": "^5.3.0",
+        "ethers": "^6.16.0",
+        "petite-vue-i18n": "^11.2.2",
+        "react": "^19.2.1",
+        "react-dom": "^19.2.1",
+        "vue": "^3.5.25"
       },
       "devDependencies": {
         "@toruslabs/eslint-config-vue": "^4.1.5",
-        "@vitejs/plugin-vue": "^6.0.1",
-        "autoprefixer": "^10.4.21",
-        "eslint": "^9.36.0",
-        "globals": "^16.4.0",
+        "@vitejs/plugin-vue": "^6.0.2",
+        "autoprefixer": "^10.4.22",
+        "eslint": "^9.39.1",
+        "globals": "^16.5.0",
         "postcss": "^8.5.6",
-        "prettier": "^3.6.2",
+        "prettier": "^3.7.4",
         "stream-browserify": "^3.0.0",
         "tailwindcss": "^3.4.13",
         "typescript": "^5.9.3",
-        "vite": "^7.1.7",
-        "vue-tsc": "^3.1.0"
+        "vite": "^7.2.6",
+        "vue-tsc": "^3.1.5"
       },
       "optionalDependencies": {
-        "@esbuild/linux-x64": "0.25.10"
+        "@esbuild/linux-x64": "0.27.1"
       }
     },
     "../../packages/modal": {
       "name": "@web3auth/modal",
-      "version": "10.7.0",
+      "version": "10.8.0",
       "dependencies": {
         "@hcaptcha/react-hcaptcha": "^1.14.0",
         "@toruslabs/base-controllers": "^8.9.0",
         "@toruslabs/http-helpers": "^8.1.1",
         "@web3auth/auth": "^10.7.0",
-        "@web3auth/no-modal": "^10.7.0",
+        "@web3auth/no-modal": "^10.8.0",
         "bowser": "^2.12.1",
         "classnames": "^2.5.1",
         "clsx": "^2.1.1",
@@ -129,7 +129,7 @@
     },
     "../../packages/no-modal": {
       "name": "@web3auth/no-modal",
-      "version": "10.7.0",
+      "version": "10.8.0",
       "license": "ISC",
       "dependencies": {
         "@ethereumjs/util": "^10.1.0",
@@ -264,6 +264,7 @@
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
       "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -861,9 +862,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
-      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
+      "version": "0.27.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.1.tgz",
+      "integrity": "sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==",
       "cpu": [
         "x64"
       ],
@@ -1597,13 +1598,13 @@
       }
     },
     "node_modules/@intlify/core-base": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.12.tgz",
-      "integrity": "sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==",
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.2.2.tgz",
+      "integrity": "sha512-0mCTBOLKIqFUP3BzwuFW23hYEl9g/wby6uY//AC5hTgQfTsM2srCYF2/hYGp+a5DZ/HIFIgKkLJMzXTt30r0JQ==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/message-compiler": "11.1.12",
-        "@intlify/shared": "11.1.12"
+        "@intlify/message-compiler": "11.2.2",
+        "@intlify/shared": "11.2.2"
       },
       "engines": {
         "node": ">= 16"
@@ -1647,12 +1648,12 @@
       }
     },
     "node_modules/@intlify/message-compiler": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.12.tgz",
-      "integrity": "sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==",
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.2.2.tgz",
+      "integrity": "sha512-XS2p8Ff5JxWsKhgfld4/MRQzZRQ85drMMPhb7Co6Be4ZOgqJX1DzcZt0IFgGTycgqL8rkYNwgnD443Q+TapOoA==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/shared": "11.1.12",
+        "@intlify/shared": "11.2.2",
         "source-map-js": "^1.0.2"
       },
       "engines": {
@@ -1663,9 +1664,9 @@
       }
     },
     "node_modules/@intlify/shared": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.12.tgz",
-      "integrity": "sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==",
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.2.2.tgz",
+      "integrity": "sha512-OtCmyFpSXxNu/oET/aN6HtPCbZ01btXVd0f3w00YsHOb13Kverk1jzA2k47pAekM55qbUw421fvPF1yxZ+gicw==",
       "license": "MIT",
       "engines": {
         "node": ">= 16"
@@ -2227,6 +2228,7 @@
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz",
       "integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-fetch": "^2.7.0"
       }
@@ -2378,6 +2380,7 @@
       "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.2.1.tgz",
       "integrity": "sha512-rONPWMC7PeExE077uLE4oqWrZ1IvAfz3oH9LibVAcVCopJiA9R62uavnbEzdkVmJYI6M6Zgkbeb07+tWjlq2XA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -2819,6 +2822,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -3185,6 +3189,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -3494,6 +3499,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -3511,9 +3517,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.29",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz",
-      "integrity": "sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==",
+      "version": "1.0.0-beta.50",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.50.tgz",
+      "integrity": "sha512-5e76wQiQVeL1ICOZVUg4LSOVYg9jyhGCin+icYozhsUzM+fHE7kddi1bdiE0jwVqTfkjba3jUFbEkoC9WkdvyA==",
       "dev": true,
       "license": "MIT"
     },
@@ -3922,6 +3928,7 @@
       "resolved": "https://registry.npmjs.org/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz",
       "integrity": "sha512-E1ImOIAD1tBZFRdjeM4/pzTiTApC0AOBGwyAMS4fwIodCWArzJ3DWdoh8cKxeFM2fElkxBh2Aqts1BPC373rHA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "buffer": "~6.0.3"
       },
@@ -3934,6 +3941,7 @@
       "resolved": "https://registry.npmjs.org/@solana/buffer-layout-utils/-/buffer-layout-utils-0.2.0.tgz",
       "integrity": "sha512-szG4sxgJGktbuZYDg2FfNmkMi0DYQoVjN2h7ta1W1hPrwzarcFLBq9UpX1UjNXsNpT9dn+chgprtWGioUAr4/g==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@solana/buffer-layout": "^4.0.0",
         "@solana/web3.js": "^1.32.0",
@@ -4592,6 +4600,7 @@
       "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-1.98.4.tgz",
       "integrity": "sha512-vv9lfnvjUsRiq//+j5pBdXig0IQdtzA0BRZ3bXEP4KaIyF1CcaydWqgyzQgfZMNIsWNWmG+AUHwPy4AHOD6gpw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.25.0",
         "@noble/curves": "^1.4.2",
@@ -4645,9 +4654,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.90.8",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.8.tgz",
-      "integrity": "sha512-4E0RP/0GJCxSNiRF2kAqE/LQkTJVlL/QNU7gIJSptaseV9HP6kOuA+N11y4bZKZxa3QopK3ZuewwutHx6DqDXQ==",
+      "version": "5.90.12",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.12.tgz",
+      "integrity": "sha512-T1/8t5DhV/SisWjDnaiU2drl6ySvsHj1bHBCWNXd+/T+Hh1cf6JodyEYMd5sgwm+b/mETT4EV3H+zCVczCU5hg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -4655,13 +4664,13 @@
       }
     },
     "node_modules/@tanstack/vue-query": {
-      "version": "5.91.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.91.0.tgz",
-      "integrity": "sha512-oyYZPu/HNfYhfd6doJHKil4hQG7I0GgZYA7cmyV6rBGsDpIYvDbBSRUWLmcd3+wkp2QnrnwqsC/4XM0lMJgGOA==",
+      "version": "5.92.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.92.1.tgz",
+      "integrity": "sha512-m672jBiwK6sv1HHFF7Q3XsLUVKejzjEAMDqhFgLXIVtmwSayUo0WnhNQmlBlcHRKCR/Lw5jmIh6iu08ZXBh4ag==",
       "license": "MIT",
       "dependencies": {
         "@tanstack/match-sorter-utils": "^8.19.4",
-        "@tanstack/query-core": "5.90.8",
+        "@tanstack/query-core": "5.90.12",
         "@vue/devtools-api": "^6.6.3",
         "vue-demi": "^0.14.10"
       },
@@ -4706,9 +4715,9 @@
       }
     },
     "node_modules/@toruslabs/base-controllers": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/base-controllers/-/base-controllers-8.9.0.tgz",
-      "integrity": "sha512-kJvri3u+1XUXwIekQxpOudrKm+rjUemyR3yWjzyHGR0XrnaciuGrA/daSeXzth9CuDhNfZIeHVDa7C0pim0hrw==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/base-controllers/-/base-controllers-8.10.0.tgz",
+      "integrity": "sha512-kjb2AiDVHWR2adoBtR43PcxDDdOZpVXebr4hW01qOdWHETvCT8vK31rjvmpXpunzFseVEE6vKXxRanVNV+C66Q==",
       "license": "ISC",
       "dependencies": {
         "@ethereumjs/util": "^10.1.0",
@@ -4897,14 +4906,14 @@
       }
     },
     "node_modules/@toruslabs/ethereum-controllers": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/ethereum-controllers/-/ethereum-controllers-8.9.0.tgz",
-      "integrity": "sha512-fMzlKXnHa6JymgFP2sQDlcO/cid9pASb2X3826sW0FGEh651FbYoWOHmVILYDCSoic7s9OFZbqHfr/T0eFbYIQ==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/ethereum-controllers/-/ethereum-controllers-8.10.0.tgz",
+      "integrity": "sha512-vpzXF1imMKhnD1msfsQgQ1LyAcA2rhwcwF+oeRNCTRFnIdloKEH7ljS+LGWAsR+RwnFPvhuGNVo3ZyFv7Cnc1g==",
       "license": "ISC",
       "dependencies": {
         "@ethereumjs/util": "^10.1.0",
         "@metamask/delegation-toolkit": "~0.13.0",
-        "@toruslabs/base-controllers": "^8.9.0",
+        "@toruslabs/base-controllers": "^8.10.0",
         "@toruslabs/http-helpers": "^8.1.1",
         "@web3auth/auth": "^10.7.0",
         "async-mutex": "^0.5.0",
@@ -5083,14 +5092,14 @@
       }
     },
     "node_modules/@toruslabs/solana-controllers": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/@toruslabs/solana-controllers/-/solana-controllers-8.9.0.tgz",
-      "integrity": "sha512-WOWC+7DFLx/cbW9EuKfOtJ7+AYrqL7nTFWxKi2+yH4cur6Ov9iaWRQq1acHlbSoe434AyPBZXGnllhme5kxwKg==",
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/@toruslabs/solana-controllers/-/solana-controllers-8.10.0.tgz",
+      "integrity": "sha512-kIHOqG/OkefD0nSx4ywyt+tuWCbkqvS2IM20HBlapM/rwjB9GQnF3HtnE4kDtXgQmjX8lPTQtFcGf/bDMX5RwA==",
       "license": "ISC",
       "dependencies": {
         "@debridge-finance/solana-transaction-parser": "^3.4.1",
         "@solana/web3.js": "^1.98.4",
-        "@toruslabs/base-controllers": "^8.9.0",
+        "@toruslabs/base-controllers": "^8.10.0",
         "@toruslabs/bs58": "^1.0.0",
         "@toruslabs/http-helpers": "^8.1.1",
         "@toruslabs/tweetnacl-js": "^1.0.4",
@@ -5338,6 +5347,7 @@
       "integrity": "sha512-tK3GPFWbirvNgsNKto+UmB/cRtn6TZfyw0D6IKrW55n6Vbs7KJoZtI//kpTKzE/DUmmnAFD8/Ca46s7Obs92/w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.46.4",
         "@typescript-eslint/types": "8.46.4",
@@ -5820,13 +5830,13 @@
       ]
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz",
-      "integrity": "sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.2.tgz",
+      "integrity": "sha512-iHmwV3QcVGGvSC1BG5bZ4z6iwa1SOpAPWmnjOErd4Ske+lZua5K9TtAVdx0gMBClJ28DViCbSmZitjWZsWO3LA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@rolldown/pluginutils": "1.0.0-beta.29"
+        "@rolldown/pluginutils": "1.0.0-beta.50"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
@@ -5893,13 +5903,13 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",
-      "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.25.tgz",
+      "integrity": "sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.28.5",
-        "@vue/shared": "3.5.24",
+        "@vue/shared": "3.5.25",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
@@ -5918,26 +5928,26 @@
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",
-      "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz",
+      "integrity": "sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.24",
-        "@vue/shared": "3.5.24"
+        "@vue/compiler-core": "3.5.25",
+        "@vue/shared": "3.5.25"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",
-      "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz",
+      "integrity": "sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.28.5",
-        "@vue/compiler-core": "3.5.24",
-        "@vue/compiler-dom": "3.5.24",
-        "@vue/compiler-ssr": "3.5.24",
-        "@vue/shared": "3.5.24",
+        "@vue/compiler-core": "3.5.25",
+        "@vue/compiler-dom": "3.5.25",
+        "@vue/compiler-ssr": "3.5.25",
+        "@vue/shared": "3.5.25",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.21",
         "postcss": "^8.5.6",
@@ -5945,13 +5955,13 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",
-      "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz",
+      "integrity": "sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.24",
-        "@vue/shared": "3.5.24"
+        "@vue/compiler-dom": "3.5.25",
+        "@vue/shared": "3.5.25"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -5987,9 +5997,9 @@
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.1.3.tgz",
-      "integrity": "sha512-KpR1F/eGAG9D1RZ0/T6zWJs6dh/pRLfY5WupecyYKJ1fjVmDMgTPw9wXmKv2rBjo4zCJiOSiyB8BDP1OUwpMEA==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.1.5.tgz",
+      "integrity": "sha512-FMcqyzWN+sYBeqRMWPGT2QY0mUasZMVIuHvmb5NT3eeqPrbHBYtCP8JWEUCDCgM+Zr62uuWY/qoeBrPrzfa78w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6024,53 +6034,53 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
-      "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.25.tgz",
+      "integrity": "sha512-5xfAypCQepv4Jog1U4zn8cZIcbKKFka3AgWHEFQeK65OW+Ys4XybP6z2kKgws4YB43KGpqp5D/K3go2UPPunLA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.24"
+        "@vue/shared": "3.5.25"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
-      "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.25.tgz",
+      "integrity": "sha512-Z751v203YWwYzy460bzsYQISDfPjHTl+6Zzwo/a3CsAf+0ccEjQ8c+0CdX1WsumRTHeywvyUFtW6KvNukT/smA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.24",
-        "@vue/shared": "3.5.24"
+        "@vue/reactivity": "3.5.25",
+        "@vue/shared": "3.5.25"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
-      "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.25.tgz",
+      "integrity": "sha512-a4WrkYFbb19i9pjkz38zJBg8wa/rboNERq3+hRRb0dHiJh13c+6kAbgqCPfMaJ2gg4weWD3APZswASOfmKwamA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.24",
-        "@vue/runtime-core": "3.5.24",
-        "@vue/shared": "3.5.24",
+        "@vue/reactivity": "3.5.25",
+        "@vue/runtime-core": "3.5.25",
+        "@vue/shared": "3.5.25",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
-      "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.25.tgz",
+      "integrity": "sha512-UJaXR54vMG61i8XNIzTSf2Q7MOqZHpp8+x3XLGtE3+fL+nQd+k7O5+X3D/uWrnQXOdMw5VPih+Uremcw+u1woQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.24",
-        "@vue/shared": "3.5.24"
+        "@vue/compiler-ssr": "3.5.25",
+        "@vue/shared": "3.5.25"
       },
       "peerDependencies": {
-        "vue": "3.5.24"
+        "vue": "3.5.25"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",
-      "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.25.tgz",
+      "integrity": "sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==",
       "license": "MIT"
     },
     "node_modules/@vuelidate/core": {
@@ -6152,6 +6162,7 @@
       "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-2.22.1.tgz",
       "integrity": "sha512-cG/xwQWsBEcKgRTkQVhH29cbpbs/TdcUJVFXCyri3ZknxhMyGv0YEjTcrNpRgt2SaswL1KrvslSNYKKo+5YEAg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "eventemitter3": "5.0.1",
         "mipd": "0.0.7",
@@ -6750,6 +6761,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -6798,9 +6810,9 @@
       "license": "0BSD"
     },
     "node_modules/@web3auth/auth": {
-      "version": "10.7.0",
-      "resolved": "https://registry.npmjs.org/@web3auth/auth/-/auth-10.7.0.tgz",
-      "integrity": "sha512-e0GYLTgd3hjCsKDwrTVk8XeAmgV/l0JZEMjG/owGjj2yM7kyKmEal6abYPCki8kHc/YDh+UnpQR06IF09eGv+Q==",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/@web3auth/auth/-/auth-10.8.0.tgz",
+      "integrity": "sha512-c0a7HVzzbO8IygPetCzw6CkUIcFkWlXSjIAQkJwwMSYtWofsHYhYLLMV7cixSgvIOxQKCuRcvO6Qo7fxz9BiBg==",
       "license": "MIT",
       "dependencies": {
         "@ethereumjs/util": "^10.1.0",
@@ -6893,12 +6905,12 @@
       }
     },
     "node_modules/@web3auth/ws-embed": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@web3auth/ws-embed/-/ws-embed-5.2.2.tgz",
-      "integrity": "sha512-8VOQqEVz1ypOz/QF3Zw6qCeF0qXksvKMEcfz718HRu8LS08KoAsAKWGvhKfBk3CGZNcgE8dJPMufDyzruU+OFw==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@web3auth/ws-embed/-/ws-embed-5.3.0.tgz",
+      "integrity": "sha512-RWDEOqQxFIAoVjtvU5AVmj3El76YIXV2/Jme1I0dFDZbcQvNsVRsnLuMupRxiAeyOqdUCvgJkThOjmWubqWfwQ==",
       "license": "ISC",
       "dependencies": {
-        "@toruslabs/base-controllers": "^8.9.0",
+        "@toruslabs/base-controllers": "^8.10.0",
         "@web3auth/auth": "^10.7.0",
         "fast-deep-equal": "^3.1.3",
         "loglevel": "^1.9.2",
@@ -6968,6 +6980,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7021,9 +7034,9 @@
       }
     },
     "node_modules/alien-signals": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.1.0.tgz",
-      "integrity": "sha512-yufC6VpSy8tK3I0lO67pjumo5JvDQVQyr38+3OHqe6CHl1t2VZekKZ7EKKZSqk0cRmE7U7tfZbpXiKNzuc+ckg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-3.1.1.tgz",
+      "integrity": "sha512-ogkIWbVrLwKtHY6oOAXaYkAxP+cTH7V5FZ5+Tm4NZFd8VDZ6uNMDrfzqctTZ42eTMCSR3ne3otpcxmqSnFfPYA==",
       "dev": true,
       "license": "MIT"
     },
@@ -7265,6 +7278,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "browserslist": "^4.27.0",
         "caniuse-lite": "^1.0.30001754",
@@ -7494,6 +7508,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -7556,6 +7571,7 @@
       "integrity": "sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-gyp-build": "^4.3.0"
       },
@@ -7881,7 +7897,6 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.2.tgz",
       "integrity": "sha512-UNqkvCDXstVck3kdowtOTWROIJQwafjOfXSmddoDrXo4cewMKmusCeF22Q24zvjR8nwWib/3S/dfyzPItPEiJg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-name": "^2.0.0"
       },
@@ -7894,7 +7909,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
       "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12.20"
       }
@@ -7904,7 +7918,6 @@
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.2.tgz",
       "integrity": "sha512-RxmjYxbWemV9gKu4zPgiZagUxbH3RQpEIO77XoSSX0ivgABDZ+h8Zuash/EMFLTI4N9QgFPOJ6JQpPZKFxa+dA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-name": "^2.0.0"
       },
@@ -8007,9 +8020,9 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
       "license": "MIT"
     },
     "node_modules/culori": {
@@ -8308,6 +8321,7 @@
       "resolved": "https://registry.npmjs.org/eciesjs/-/eciesjs-0.4.16.tgz",
       "integrity": "sha512-dS5cbA9rA2VR4Ybuvhg6jvdmp46ubLn3E+px8cG/35aEDNclrqoCjg6mt0HYZ/M+OoESS3jSkCrqk1kWAEhWAw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ecies/ciphers": "^0.2.4",
         "@noble/ciphers": "^1.3.0",
@@ -8721,6 +8735,7 @@
       "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -8797,6 +8812,7 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -8923,6 +8939,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -9081,6 +9098,7 @@
       "integrity": "sha512-SbR9ZBUFKgvWAbq3RrdCtWaW0IKm6wwUiApxf3BVTNfqUIo4IQQmreMg2iHFJJ6C/0wss3LXURBJ1OwS/MhFcQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -9412,9 +9430,9 @@
       }
     },
     "node_modules/ethers": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.15.0.tgz",
-      "integrity": "sha512-Kf/3ZW54L4UT0pZtsY/rf+EkBU7Qi5nnhonjUb8yTXcxH3cdcWrV2cRyk0Xk/4jK6OoHhxxZHriyhje20If2hQ==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.16.0.tgz",
+      "integrity": "sha512-U1wulmetNymijEhpSEQ7Ct/P/Jw9/e7R1j5XIbPRydgV2DjLVMsULDlNksq3RQnFgKoLlZf88ijYtWEXcPa07A==",
       "funding": [
         {
           "type": "individual",
@@ -9518,7 +9536,8 @@
       "version": "6.4.9",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz",
       "integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
@@ -10844,6 +10863,7 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -10958,7 +10978,6 @@
       "integrity": "sha512-uuPNLJkKN8NXAlZlQ6kmUF9qO+T6Kyd7oV4+/7yy8Jz6+MZNyhPq8EdLpdfnPVzUC8qSf1b4j1azKaGnFsjmsw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "acorn": "^8.5.0",
         "eslint-visitor-keys": "^3.0.0",
@@ -10978,7 +10997,6 @@
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -10992,7 +11010,6 @@
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -11715,7 +11732,6 @@
       ],
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "dependencies": {
         "@adraffy/ens-normalize": "^1.11.0",
         "@noble/ciphers": "^1.3.0",
@@ -11740,8 +11756,7 @@
       "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.11.1.tgz",
       "integrity": "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ==",
       "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
     },
     "node_modules/ox/node_modules/@noble/ciphers": {
       "version": "1.3.0",
@@ -11749,7 +11764,6 @@
       "integrity": "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==",
       "license": "MIT",
       "optional": true,
-      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -11762,8 +11776,7 @@
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
       "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
@@ -11907,13 +11920,13 @@
       }
     },
     "node_modules/petite-vue-i18n": {
-      "version": "11.1.12",
-      "resolved": "https://registry.npmjs.org/petite-vue-i18n/-/petite-vue-i18n-11.1.12.tgz",
-      "integrity": "sha512-wvn2FgSlN14KNV2o62OZZ3fFJRmn9EilGOHTjB2UW/x8QmbjaGd/BCw3u1iFoxwP5C/+7bJvFWu4ggfTXtdJTA==",
+      "version": "11.2.2",
+      "resolved": "https://registry.npmjs.org/petite-vue-i18n/-/petite-vue-i18n-11.2.2.tgz",
+      "integrity": "sha512-f2Trg24KY8yJ1O3c2Uu7uZtR/gVBuoU+0dNcDIrFt9EM4zuxcTTx8VxVGsibZdLs4Da6WjRhOh52AY4o2yHhfQ==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/core-base": "11.1.12",
-        "@intlify/shared": "11.1.12",
+        "@intlify/core-base": "11.2.2",
+        "@intlify/shared": "11.2.2",
         "@vue/devtools-api": "^6.5.0"
       },
       "engines": {
@@ -12163,6 +12176,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -12321,11 +12335,12 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
-      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz",
+      "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -12465,24 +12480,24 @@
       "license": "MIT"
     },
     "node_modules/react": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
-      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz",
+      "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
-      "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz",
+      "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==",
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.0"
+        "react": "^19.2.1"
       }
     },
     "node_modules/read-cache": {
@@ -12508,6 +12523,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -13095,6 +13111,7 @@
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
       "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
@@ -13537,6 +13554,7 @@
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.18.tgz",
       "integrity": "sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -13645,6 +13663,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -13863,6 +13882,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -13957,6 +13977,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "napi-postinstall": "^0.3.0"
       },
@@ -14164,6 +14185,7 @@
       "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "node-gyp-build": "^4.3.0"
       },
@@ -14213,6 +14235,7 @@
       "resolved": "https://registry.npmjs.org/valtio/-/valtio-1.13.2.tgz",
       "integrity": "sha512-Qik0o+DSy741TmkqmRfjq+0xpZBXi/Y6+fXZLn0xNF1z/waFMbE3rkivv5Zcf9RrMUp6zswf2J7sbh2KBlba5A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "derive-valtio": "0.1.0",
         "proxy-compare": "2.6.0",
@@ -14245,6 +14268,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@noble/curves": "1.9.1",
         "@noble/hashes": "1.8.0",
@@ -14376,11 +14400,12 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.2.tgz",
-      "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.6.tgz",
+      "integrity": "sha512-tI2l/nFHC5rLh7+5+o7QjKjSR04ivXDF4jcgV0f/bTQ+OJiITy5S6gaynVsEM+7RqzufMnVbIon6Sr5x1SDYaQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -14474,6 +14499,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -14489,16 +14515,17 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.24",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
-      "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
+      "version": "3.5.25",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.25.tgz",
+      "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@vue/compiler-dom": "3.5.24",
-        "@vue/compiler-sfc": "3.5.24",
-        "@vue/runtime-dom": "3.5.24",
-        "@vue/server-renderer": "3.5.24",
-        "@vue/shared": "3.5.24"
+        "@vue/compiler-dom": "3.5.25",
+        "@vue/compiler-sfc": "3.5.25",
+        "@vue/runtime-dom": "3.5.25",
+        "@vue/server-renderer": "3.5.25",
+        "@vue/shared": "3.5.25"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -14515,6 +14542,7 @@
       "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0",
@@ -14534,14 +14562,14 @@
       }
     },
     "node_modules/vue-tsc": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.1.3.tgz",
-      "integrity": "sha512-StMNfZHwPIXQgY3KxPKM0Jsoc8b46mDV3Fn2UlHCBIwRJApjqrSwqeMYgWf0zpN+g857y74pv7GWuBm+UqQe1w==",
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.1.5.tgz",
+      "integrity": "sha512-L/G9IUjOWhBU0yun89rv8fKqmKC+T0HfhrFjlIml71WpfBv9eb4E9Bev8FMbyueBIU9vxQqbd+oOsVcDa5amGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@volar/typescript": "2.4.23",
-        "@vue/language-core": "3.1.3"
+        "@vue/language-core": "3.1.5"
       },
       "bin": {
         "vue-tsc": "bin/vue-tsc.js"
@@ -14827,6 +14855,7 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
       "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -14882,7 +14911,6 @@
       "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
       "devOptional": true,
       "license": "ISC",
-      "peer": true,
       "bin": {
         "yaml": "bin.mjs"
       },
@@ -14896,7 +14924,6 @@
       "integrity": "sha512-E/+VitOorXSLiAqtTd7Yqax0/pAS3xaYMP+AUUJGOK1OZG3rhcj9fcJOM5HJ2VrP1FrStVCWr1muTfQCdj4tAA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.0.0",
         "yaml": "^2.0.0"
@@ -14914,7 +14941,6 @@
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -15077,6 +15103,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
       "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/demo/vue-app-new/package.json b/demo/vue-app-new/package.json
index 8d8ac74d1..fecdb818e 100644
--- a/demo/vue-app-new/package.json
+++ b/demo/vue-app-new/package.json
@@ -11,47 +11,47 @@
   },
   "dependencies": {
     "@solana/web3.js": "^1.98.4",
-    "@tanstack/vue-query": "^5.90.2",
-    "@toruslabs/base-controllers": "^8.7.0",
+    "@tanstack/vue-query": "^5.92.1",
+    "@toruslabs/base-controllers": "^8.10.0",
     "@toruslabs/bs58": "^1.0.0",
-    "@toruslabs/ethereum-controllers": "^8.7.0",
-    "@toruslabs/solana-controllers": "^8.7.0",
+    "@toruslabs/ethereum-controllers": "^8.10.0",
+    "@toruslabs/solana-controllers": "^8.10.0",
     "@toruslabs/tweetnacl-js": "^1.0.4",
     "@toruslabs/vue-components": "^8.1.2",
-    "@toruslabs/vue-icons": "^8.0.2",
+    "@toruslabs/vue-icons": "^8.0.4",
     "@wagmi/vue": "^0.2.11",
-    "@web3auth/auth": "^10.5.0",
+    "@web3auth/auth": "^10.8.0",
     "@web3auth/modal": "file:../../packages/modal",
     "@web3auth/no-modal": "file:../../packages/no-modal",
     "@web3auth/sign-in-with-ethereum": "^5.0.0",
-    "@web3auth/ws-embed": "^5.1.0",
-    "ethers": "^6.15.0",
-    "petite-vue-i18n": "^11.1.12",
-    "vue": "^3.5.22",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0"
+    "@web3auth/ws-embed": "^5.3.0",
+    "ethers": "^6.16.0",
+    "petite-vue-i18n": "^11.2.2",
+    "vue": "^3.5.25",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1"
   },
   "overrides": {
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
     "use-sync-external-store": "^1.4.0"
   },
   "devDependencies": {
     "@toruslabs/eslint-config-vue": "^4.1.5",
-    "@vitejs/plugin-vue": "^6.0.1",
-    "autoprefixer": "^10.4.21",
-    "eslint": "^9.36.0",
-    "globals": "^16.4.0",
+    "@vitejs/plugin-vue": "^6.0.2",
+    "autoprefixer": "^10.4.22",
+    "eslint": "^9.39.1",
+    "globals": "^16.5.0",
     "postcss": "^8.5.6",
-    "prettier": "^3.6.2",
+    "prettier": "^3.7.4",
     "stream-browserify": "^3.0.0",
     "tailwindcss": "^3.4.13",
     "typescript": "^5.9.3",
-    "vite": "^7.1.7",
-    "vue-tsc": "^3.1.0"
+    "vite": "^7.2.6",
+    "vue-tsc": "^3.1.5"
   },
   "optionalDependencies": {
-    "@esbuild/linux-x64": "0.25.10"
+    "@esbuild/linux-x64": "0.27.1"
   },
   "lint-staged": {
     "!(*d).{js,ts}": [
diff --git a/demo/vue-app-new/src/MainView.vue b/demo/vue-app-new/src/MainView.vue
index 67de8d03b..7b704d371 100644
--- a/demo/vue-app-new/src/MainView.vue
+++ b/demo/vue-app-new/src/MainView.vue
@@ -139,6 +139,7 @@ const options = computed((): Web3AuthOptions => {
       connectors: modalParams.value,
       hideWalletDiscovery: !formData.showWalletDiscovery,
     },
+    initialAuthenticationMode: formData.initialAuthenticationMode,
   };
 });
 
@@ -210,6 +211,7 @@ onBeforeMount(() => {
         formData.smartAccountChains = json.smartAccountChains || [];
         formData.smartAccountChainsConfig = json.smartAccountChainsConfig || {};
         formData.defaultChainId = json.defaultChainId;
+        formData.initialAuthenticationMode = json.initialAuthenticationMode;
       }
     } catch (error) {}
   }
diff --git a/demo/vue-app-new/src/components/AppDashboard.vue b/demo/vue-app-new/src/components/AppDashboard.vue
index 7b6d507f4..040364e7e 100644
--- a/demo/vue-app-new/src/components/AppDashboard.vue
+++ b/demo/vue-app-new/src/components/AppDashboard.vue
@@ -14,7 +14,7 @@ import {
   useWeb3AuthUser,
   useSwitchChain as useWeb3AuthSwitchChain,
 } from "@web3auth/modal/vue";
-import { type CustomChainConfig, type NFTCheckoutPluginType } from "@web3auth/no-modal";
+import { CONNECTOR_INITIAL_AUTHENTICATION_MODE, type CustomChainConfig, type NFTCheckoutPluginType } from "@web3auth/no-modal";
 import { useI18n } from "petite-vue-i18n";
 
 import { useSignAndSendTransaction, useSignMessage as useSolanaSignMessage, useSignTransaction, useSolanaWallet } from "@web3auth/modal/vue/solana";
@@ -40,7 +40,7 @@ const props = defineProps<{
   chains: CustomChainConfig[];
 }>();
 
-const { isConnected, provider, web3Auth, isMFAEnabled } = useWeb3Auth();
+const { isConnected, provider, web3Auth, isMFAEnabled, isAuthorized } = useWeb3Auth();
 const { userInfo, loading: userInfoLoading } = useWeb3AuthUser();
 const { enableMFA } = useEnableMFA();
 const { manageMFA } = useManageMFA();
@@ -92,7 +92,7 @@ const isDisplay = (name: "dashboard" | "ethServices" | "solServices" | "walletSe
   const chainNamespace = currentChainNamespace.value;
   switch (name) {
     case "dashboard":
-      return isConnected.value;
+      return formData.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN ? isAuthorized.value : isConnected.value;
 
     case "ethServices":
       return chainNamespace === CHAIN_NAMESPACES.EIP155;
diff --git a/demo/vue-app-new/src/components/AppHeader.vue b/demo/vue-app-new/src/components/AppHeader.vue
index 93d902919..019691d17 100644
--- a/demo/vue-app-new/src/components/AppHeader.vue
+++ b/demo/vue-app-new/src/components/AppHeader.vue
@@ -3,20 +3,23 @@ import { Button } from "@toruslabs/vue-components";
 import { useWeb3Auth, useWeb3AuthDisconnect } from "@web3auth/modal/vue";
 import { useI18n } from "petite-vue-i18n";
 import { watch } from "vue";
+import { formDataStore } from "../store/form";
+import { CONNECTOR_INITIAL_AUTHENTICATION_MODE } from "@web3auth/no-modal";
 
 const { log } = console;
 const { t } = useI18n({ useScope: "global" });
 
-const { status, isConnected } = useWeb3Auth();
+const { status, isConnected, isAuthorized } = useWeb3Auth();
 const { disconnect } = useWeb3AuthDisconnect();
+const formData = formDataStore;
 
 const isDisplay = (name: string): boolean => {
   switch (name) {
     case "btnLogout":
-      return isConnected.value;
+      return formData.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN ? isAuthorized.value : isConnected.value;
 
     case "appHeading":
-      return isConnected.value;
+      return formData.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN ? isAuthorized.value : isConnected.value;
 
     default: {
       return false;
diff --git a/demo/vue-app-new/src/components/AppSettings.vue b/demo/vue-app-new/src/components/AppSettings.vue
index 08c927a73..260505460 100644
--- a/demo/vue-app-new/src/components/AppSettings.vue
+++ b/demo/vue-app-new/src/components/AppSettings.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Button, Card, Select, Tab, Tabs, Tag, TextField, Toggle } from "@toruslabs/vue-components";
-import { CHAIN_NAMESPACES, ChainNamespaceType, CONNECTOR_STATUS, log } from "@web3auth/modal";
+import { CHAIN_NAMESPACES, ChainNamespaceType, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_STATUS, log } from "@web3auth/modal";
 import { useWeb3Auth, useWeb3AuthConnect } from "@web3auth/modal/vue";
 import { computed, InputHTMLAttributes, ref } from "vue";
 import {
@@ -19,7 +19,7 @@ import { getChainConfig } from "../utils/chainconfig";
 
 const formData = formDataStore;
 
-const { status, isConnected, isInitialized } = useWeb3Auth();
+const { status, isConnected, isInitialized, isAuthorized } = useWeb3Auth();
 const { connect } = useWeb3AuthConnect();
 
 const chainOptions = computed(() => {
@@ -58,7 +58,7 @@ const connectorOptions = computed(() =>
 );
 
 const isDisplay = (_name: string): boolean => {
-  return !isConnected.value;
+  return formData.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_ONLY ? !isConnected.value : !isAuthorized.value;
 };
 
 const isDisabled = (name: string): boolean => {
@@ -229,6 +229,18 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             matchParentsWidth
             :show-check-box="true"
           />
+          <Select
+            v-model="formData.initialAuthenticationMode"
+            data-testid="selectInitialAuthenticationMode"
+            :label="$t('app.initialAuthenticationMode')"
+            :aria-label="$t('app.initialAuthenticationMode')"
+            :placeholder="$t('app.initialAuthenticationMode')"
+            :options="[
+              { name: 'Connect Only', value: 'connect-only' },
+              { name: 'Connect and Sign', value: 'connect-and-sign' },
+            ]"
+            matchParentsWidth
+          />
           <Toggle
             v-model="formData.showWalletDiscovery"
             data-testid="showWalletDiscovery"
diff --git a/demo/vue-app-new/src/config.ts b/demo/vue-app-new/src/config.ts
index d04d94fd6..c26f81bc8 100644
--- a/demo/vue-app-new/src/config.ts
+++ b/demo/vue-app-new/src/config.ts
@@ -4,6 +4,7 @@ import {
   ChainNamespaceType,
   CONFIRMATION_STRATEGY,
   type CONFIRMATION_STRATEGY_TYPE,
+  type ConnectorInitialAuthenticationModeType,
   LoginMethodConfig,
   ModalConfig,
   SignTypedDataMessageV4,
@@ -62,6 +63,7 @@ export const languageOptions: { name: string; value: LANGUAGE_TYPE }[] = [
   { name: "Portuguese", value: LANGUAGES.pt },
   { name: "Dutch", value: LANGUAGES.nl },
   { name: "Turkish", value: LANGUAGES.tr },
+  { name: "Amharic", value: LANGUAGES.am },
 ];
 
 export const defaultLoginMethod: Record<AUTH_CONNECTION_TYPE, ModalConfig> = loginProviderOptions.reduce(
@@ -109,6 +111,7 @@ export type FormData = {
     config: WhiteLabelData;
   };
   connectors: string[];
+  initialAuthenticationMode: ConnectorInitialAuthenticationModeType;
   loginProviders: AUTH_CONNECTION_TYPE[];
   showWalletDiscovery: boolean;
   multiInjectedProviderDiscovery: boolean;
diff --git a/demo/vue-app-new/src/store/form.ts b/demo/vue-app-new/src/store/form.ts
index 6b0164c30..bb7e023a0 100644
--- a/demo/vue-app-new/src/store/form.ts
+++ b/demo/vue-app-new/src/store/form.ts
@@ -1,5 +1,5 @@
 import { WEB3AUTH_NETWORK } from "@web3auth/auth";
-import { CHAIN_NAMESPACES, WIDGET_TYPE } from "@web3auth/modal";
+import { CHAIN_NAMESPACES, CONNECTOR_INITIAL_AUTHENTICATION_MODE, WIDGET_TYPE } from "@web3auth/modal";
 import { reactive } from "vue";
 
 import { chainConfigs, defaultLoginMethod, FormData, initWhiteLabel } from "../config";
@@ -7,6 +7,7 @@ import { chainConfigs, defaultLoginMethod, FormData, initWhiteLabel } from "../c
 export const formDataStore = reactive<FormData>({
   // authMode: "",
   connectors: [],
+  initialAuthenticationMode: CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_ONLY,
   network: process.env.NODE_ENV === "production" ? WEB3AUTH_NETWORK.SAPPHIRE_MAINNET : WEB3AUTH_NETWORK.SAPPHIRE_DEVNET,
   chainNamespaces: [CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA],
   chains: [chainConfigs[CHAIN_NAMESPACES.EIP155][0], chainConfigs[CHAIN_NAMESPACES.SOLANA][0]],
diff --git a/demo/vue-app-new/src/translations/en.json b/demo/vue-app-new/src/translations/en.json
index c5d91c42e..9394906b5 100644
--- a/demo/vue-app-new/src/translations/en.json
+++ b/demo/vue-app-new/src/translations/en.json
@@ -9,6 +9,7 @@
     "defaultChainId": "Default Chain ID",
     "loginProviders": "Login provider",
     "connectors": "Connectors",
+    "initialAuthenticationMode": "Authentication Mode",
     "showWalletDiscovery": "Show Wallet Discovery",
     "multiInjectedProviderDiscovery": "Multi Injected Provider Discovery",
     "greeting": "Let's configure Web3Auth!",
diff --git a/package-lock.json b/package-lock.json
index 1711fdb6c..b68fa6da8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -96,7 +96,6 @@
       "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.5",
@@ -1769,7 +1768,6 @@
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
       "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -2001,7 +1999,6 @@
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
@@ -4557,7 +4554,6 @@
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -4701,7 +4697,6 @@
       "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz",
       "integrity": "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "^14.21.3 || >=16"
       },
@@ -5773,7 +5768,6 @@
       "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^4.0.0",
         "@octokit/graphql": "^7.1.0",
@@ -6405,7 +6399,6 @@
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -6821,7 +6814,6 @@
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -7176,7 +7168,6 @@
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -8670,7 +8661,6 @@
       "integrity": "sha512-CEEhCDmkvztd1zbgADsEQhmj9GyWOOGeW1hZD+gtwbBSF5YN1uofS/pex5MIh/VIqKRj+A2UnYWI1V+9+q/lyQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@solana/accounts": "3.0.3",
         "@solana/addresses": "3.0.3",
@@ -10038,7 +10028,6 @@
       "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/core": "^7.21.3",
         "@svgr/babel-preset": "8.1.0",
@@ -10204,6 +10193,7 @@
       "integrity": "sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "remove-accents": "0.5.0"
       },
@@ -10221,6 +10211,7 @@
       "integrity": "sha512-6PN65csiuTNfBMXqQUxQhCNdtm1rV+9kC9YwWAIKcaxAauq3Wu7p18j3gQY3YIBJU70jT/wzCCZ2uqto/vQgiQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
@@ -10232,6 +10223,7 @@
       "integrity": "sha512-wAHc/cgKzW7LZNFloThyHnV/AX9gTg3w5yAv0gvQHPZoCnepwqCMtzbuPbb2UvfvO32XZ46e8bPOYbfZhzVnnQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@tanstack/query-core": "5.90.7"
       },
@@ -11078,7 +11070,6 @@
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -11188,7 +11179,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz",
       "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -11213,7 +11203,6 @@
       "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -11320,7 +11309,6 @@
       "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.46.3",
         "@typescript-eslint/types": "8.46.3",
@@ -11925,7 +11913,8 @@
       "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
       "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@vue/eslint-config-typescript": {
       "version": "14.6.0",
@@ -12215,7 +12204,6 @@
       "integrity": "sha512-cG/xwQWsBEcKgRTkQVhH29cbpbs/TdcUJVFXCyri3ZknxhMyGv0YEjTcrNpRgt2SaswL1KrvslSNYKKo+5YEAg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "eventemitter3": "5.0.1",
         "mipd": "0.0.7",
@@ -12775,7 +12763,6 @@
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -13573,7 +13560,6 @@
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -14333,7 +14319,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -14432,7 +14417,6 @@
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -15127,7 +15111,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "browserslist": "^4.27.0",
         "caniuse-lite": "^1.0.30001754",
@@ -15177,7 +15160,6 @@
       "integrity": "sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.4",
@@ -15856,7 +15838,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.19",
         "caniuse-lite": "^1.0.30001751",
@@ -16642,7 +16623,6 @@
       "resolved": "https://registry.npmjs.org/color/-/color-5.0.3.tgz",
       "integrity": "sha512-ezmVcLR3xAVp8kYOm4GS45ZLLgIE6SPAFoduLr6hTDajwb3KZ2F46gulK3XpcwRFb5KKGCSezCBAY4Dw4HsyXA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-convert": "^3.1.3",
         "color-string": "^2.1.3"
@@ -17321,7 +17301,6 @@
       "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.1.0.tgz",
       "integrity": "sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "node-fetch": "^2.7.0"
       }
@@ -18382,7 +18361,6 @@
       "resolved": "https://registry.npmjs.org/eciesjs/-/eciesjs-0.4.16.tgz",
       "integrity": "sha512-dS5cbA9rA2VR4Ybuvhg6jvdmp46ubLn3E+px8cG/35aEDNclrqoCjg6mt0HYZ/M+OoESS3jSkCrqk1kWAEhWAw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@ecies/ciphers": "^0.2.4",
         "@noble/ciphers": "^1.3.0",
@@ -18929,7 +18907,6 @@
       "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -19019,7 +18996,6 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -19415,7 +19391,6 @@
       "integrity": "sha512-SbR9ZBUFKgvWAbq3RrdCtWaW0IKm6wwUiApxf3BVTNfqUIo4IQQmreMg2iHFJJ6C/0wss3LXURBJ1OwS/MhFcQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -19961,8 +19936,7 @@
       "version": "6.4.9",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz",
       "integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
@@ -23848,6 +23822,7 @@
       "integrity": "sha512-uuPNLJkKN8NXAlZlQ6kmUF9qO+T6Kyd7oV4+/7yy8Jz6+MZNyhPq8EdLpdfnPVzUC8qSf1b4j1azKaGnFsjmsw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "acorn": "^8.5.0",
         "eslint-visitor-keys": "^3.0.0",
@@ -23867,6 +23842,7 @@
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -23880,6 +23856,7 @@
       "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -23898,6 +23875,7 @@
       "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
       "license": "ISC",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -27160,7 +27138,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@napi-rs/wasm-runtime": "0.2.4",
         "@yarnpkg/lockfile": "^1.1.0",
@@ -28041,6 +28018,7 @@
       ],
       "license": "MIT",
       "optional": true,
+      "peer": true,
       "dependencies": {
         "@adraffy/ens-normalize": "^1.11.0",
         "@noble/ciphers": "^1.3.0",
@@ -28065,7 +28043,8 @@
       "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.11.1.tgz",
       "integrity": "sha512-nhCBV3quEgesuf7c7KYfperqSS14T8bYuvJ8PcLJp6znkZpFc0AuW4qBtr8eKVyPPe/8RSr7sglCWPU5eaxwKQ==",
       "license": "MIT",
-      "optional": true
+      "optional": true,
+      "peer": true
     },
     "node_modules/p-finally": {
       "version": "1.0.0",
@@ -29196,7 +29175,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -30170,7 +30148,6 @@
       "integrity": "sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -31444,7 +31421,6 @@
       "integrity": "sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@octokit/auth-token": "^6.0.0",
         "@octokit/graphql": "^9.0.3",
@@ -31864,7 +31840,8 @@
       "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
       "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
@@ -32247,7 +32224,6 @@
       "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -32646,7 +32622,8 @@
       "version": "0.26.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
       "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/schema-utils": {
       "version": "4.3.3",
@@ -32674,7 +32651,6 @@
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -33329,7 +33305,6 @@
       "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
       "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
         "debug": "~4.3.2",
@@ -34320,7 +34295,6 @@
       "integrity": "sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -34430,7 +34404,6 @@
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -35091,7 +35064,6 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -35485,7 +35457,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -35779,7 +35750,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "napi-postinstall": "^0.3.0"
       },
@@ -36179,7 +36149,6 @@
       "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
@@ -36274,7 +36243,6 @@
       "integrity": "sha512-Qik0o+DSy741TmkqmRfjq+0xpZBXi/Y6+fXZLn0xNF1z/waFMbE3rkivv5Zcf9RrMUp6zswf2J7sbh2KBlba5A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "derive-valtio": "0.1.0",
         "proxy-compare": "2.6.0",
@@ -36317,7 +36285,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/curves": "1.9.1",
         "@noble/hashes": "1.8.0",
@@ -36445,7 +36412,6 @@
       "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.25",
         "@vue/compiler-sfc": "3.5.25",
@@ -36495,7 +36461,6 @@
       "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0",
@@ -36902,7 +36867,6 @@
       "integrity": "sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
@@ -37029,7 +36993,6 @@
       "integrity": "sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -37924,7 +37887,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
       "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -38155,6 +38117,7 @@
       "integrity": "sha512-E/+VitOorXSLiAqtTd7Yqax0/pAS3xaYMP+AUUJGOK1OZG3rhcj9fcJOM5HJ2VrP1FrStVCWr1muTfQCdj4tAA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.0.0",
         "yaml": "^2.0.0"
@@ -38172,6 +38135,7 @@
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -38419,7 +38383,6 @@
       "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
       "devOptional": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
index 77ffcd022..65933203e 100644
--- a/packages/modal/src/modalManager.ts
+++ b/packages/modal/src/modalManager.ts
@@ -8,8 +8,10 @@ import {
   type BaseConnectorConfig,
   type ChainNamespaceType,
   cloneDeep,
+  CONNECTED_STATUSES,
   CONNECTOR_CATEGORY,
   CONNECTOR_EVENTS,
+  CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   CONNECTOR_NAMES,
   CONNECTOR_NAMESPACES,
   CONNECTOR_STATUS,
@@ -116,12 +118,14 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           chainNamespaces: this.getChainNamespaces(),
           walletRegistry: filteredWalletRegistry,
           analytics: this.analytics,
+          initialAuthenticationMode: this.options.initialAuthenticationMode,
         },
         {
           onInitExternalWallets: this.onInitExternalWallets,
           onSocialLogin: this.onSocialLogin,
           onExternalWalletLogin: this.onExternalWalletLogin,
           onModalVisibility: this.onModalVisibility,
+          onMobileVerifyConnect: this.onMobileVerifyConnect,
         }
       );
       await withAbort(() => this.loginModal.initModal(), signal);
@@ -174,7 +178,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
   public async connect(): Promise<IProvider | null> {
     if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
     // if already connected return provider
-    if (this.connectedConnectorName && this.status === CONNECTOR_STATUS.CONNECTED && this.provider) return this.provider;
+    if (this.connectedConnectorName && CONNECTED_STATUSES.includes(this.status) && this.provider) return this.provider;
     this.loginModal.open();
     return new Promise((resolve, reject) => {
       // remove all listeners when promise is resolved or rejected.
@@ -187,20 +191,27 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
       const handleError = (err: unknown) => {
         this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+        this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
         this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
         return reject(err);
       };
 
       const handleVisibility = (visibility: boolean) => {
         // modal is closed but user is not connected to any wallet.
-        if (!visibility && this.status !== CONNECTOR_STATUS.CONNECTED) {
+        if (!visibility && !CONNECTED_STATUSES.includes(this.status)) {
           this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
           this.removeListener(CONNECTOR_EVENTS.ERRORED, handleError);
+          this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
           return reject(new Error("User closed the modal"));
         }
       };
 
-      this.once(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+      if (this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN) {
+        this.once(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
+      } else {
+        this.once(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+      }
+
       this.once(CONNECTOR_EVENTS.ERRORED, handleError);
       this.once(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
     });
@@ -517,7 +528,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           this.subscribeToConnectorEvents(connector);
           const initialChain = this.getInitialChainIdForConnector(connector);
           const autoConnect = super.checkIfAutoConnect(connector);
-          await connector.init({ autoConnect, chainId: initialChain.chainId });
+          await connector.init({
+            autoConnect,
+            chainId: initialChain.chainId,
+            getIdentityToken: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+          });
 
           // note: not adding cachedWallet to modal if it is external wallet.
           // adding it later if no in-app wallets are available.
@@ -563,7 +578,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
         try {
           this.subscribeToConnectorEvents(connector);
           const initialChain = this.getInitialChainIdForConnector(connector);
-          await connector.init({ autoConnect: this.cachedConnector === connectorName, chainId: initialChain.chainId });
+          await connector.init({
+            autoConnect: this.cachedConnector === connectorName,
+            chainId: initialChain.chainId,
+            getIdentityToken: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+          });
         } catch (error) {
           log.error(error, "error while initializing connector", connectorName);
         }
@@ -649,7 +668,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       }
       if (
         !visibility &&
-        this.status === CONNECTOR_STATUS.CONNECTED &&
+        CONNECTED_STATUSES.includes(this.status) &&
         (walletConnectStatus === CONNECTOR_STATUS.READY || walletConnectStatus === CONNECTOR_STATUS.CONNECTING)
       ) {
         log.debug("this stops wc connector from trying to reconnect once proposal expires");
@@ -658,6 +677,15 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     }
   };
 
+  private onMobileVerifyConnect = async (params: { connector: WALLET_CONNECTOR_TYPE }): Promise<void> => {
+    try {
+      const connector = this.getConnector(params.connector);
+      await connector.getIdentityToken();
+    } catch (error) {
+      log.error(`Error while connecting to connector: ${params.connector}`, error);
+    }
+  };
+
   private getChainNamespaces = (): ChainNamespaceType[] => {
     return [...new Set(this.coreOptions.chains?.map((x) => x.chainNamespace) || [])];
   };
diff --git a/packages/modal/src/react/context/WalletServicesInnerContext.ts b/packages/modal/src/react/context/WalletServicesInnerContext.ts
index 4e80d639a..f333e6ec5 100644
--- a/packages/modal/src/react/context/WalletServicesInnerContext.ts
+++ b/packages/modal/src/react/context/WalletServicesInnerContext.ts
@@ -1,4 +1,4 @@
-import { CONNECTOR_STATUS, EVM_PLUGINS, PLUGIN_EVENTS } from "@web3auth/no-modal";
+import { CONNECTED_STATUSES, EVM_PLUGINS, PLUGIN_EVENTS } from "@web3auth/no-modal";
 import { type WalletServicesPluginType } from "@web3auth/no-modal";
 import { Context, createContext, createElement, PropsWithChildren, useContext, useEffect, useMemo, useState } from "react";
 
@@ -26,7 +26,7 @@ export function WalletServicesContextProvider({ children, context }: PropsWithCh
       const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES) as WalletServicesPluginType;
       setWalletServicesPlugin(plugin);
       // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
-      if (plugin?.status === CONNECTOR_STATUS.CONNECTED) setReady(true);
+      if (CONNECTED_STATUSES.includes(plugin?.status)) setReady(true);
     }
   }, [isConnected, getPlugin, walletServicesPlugin]);
 
diff --git a/packages/modal/src/react/context/Web3AuthInnerContext.ts b/packages/modal/src/react/context/Web3AuthInnerContext.ts
index dc150a18f..ee4256593 100644
--- a/packages/modal/src/react/context/Web3AuthInnerContext.ts
+++ b/packages/modal/src/react/context/Web3AuthInnerContext.ts
@@ -34,6 +34,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
   }, [web3AuthOptions, initialState]);
 
   const [isConnected, setIsConnected] = useState<boolean>(web3Auth.status === CONNECTOR_STATUS.CONNECTED);
+  const [isAuthorized, setIsAuthorized] = useState<boolean>(web3Auth.status === CONNECTOR_STATUS.AUTHORIZED);
   const [status, setStatus] = useState<CONNECTOR_STATUS_TYPE | null>(web3Auth.status);
 
   const getPlugin = useCallback(
@@ -77,7 +78,9 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     if (provider) {
       provider.on("chainChanged", handleChainChange);
       return () => {
-        provider.off("chainChanged", handleChainChange);
+        if (provider) {
+          provider.off("chainChanged", handleChainChange);
+        }
       };
     }
   }, [web3Auth, provider]);
@@ -97,9 +100,17 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
         setProvider(data.provider);
       }
     };
+    const authorizedListener = (_data: { connector: string }) => {
+      setStatus(web3Auth.status);
+      if (web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
+        setIsConnected(true);
+        setIsAuthorized(true);
+      }
+    };
     const disconnectedListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setIsAuthorized(false);
       setProvider(null);
     };
     const connectingListener = () => {
@@ -112,6 +123,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     const rehydrationErrorListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setIsAuthorized(false);
       setProvider(null);
     };
 
@@ -125,6 +137,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
       web3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
       web3Auth.on(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.on(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
       web3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
       web3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
       web3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -137,6 +150,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
         web3Auth.off(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
         web3Auth.off(CONNECTOR_EVENTS.READY, readyListener);
         web3Auth.off(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+        web3Auth.off(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
         web3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
         web3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
         web3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -152,6 +166,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     return {
       web3Auth,
       isConnected,
+      isAuthorized,
       isInitialized,
       provider,
       status,
@@ -166,6 +181,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
   }, [
     web3Auth,
     isConnected,
+    isAuthorized,
     isMFAEnabled,
     setIsMFAEnabled,
     isInitialized,
diff --git a/packages/modal/src/react/hooks/useIdentityToken.ts b/packages/modal/src/react/hooks/useIdentityToken.ts
index cdb2d4b22..bb6c9641d 100644
--- a/packages/modal/src/react/hooks/useIdentityToken.ts
+++ b/packages/modal/src/react/hooks/useIdentityToken.ts
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = () => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isAuthorized } = useWeb3AuthInner();
 
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Web3AuthError | null>(null);
@@ -34,10 +34,14 @@ export const useIdentityToken = () => {
   }, [web3Auth]);
 
   useEffect(() => {
-    if (!isConnected && token) {
+    if (!web3Auth) return;
+    if (!isAuthorized && token) {
       setToken(null);
     }
-  }, [isConnected, token]);
+    if (isAuthorized && !token) {
+      setToken(web3Auth.idToken);
+    }
+  }, [isAuthorized, token, web3Auth]);
 
   return { loading, error, token, getIdentityToken };
 };
diff --git a/packages/modal/src/react/hooks/useWeb3Auth.ts b/packages/modal/src/react/hooks/useWeb3Auth.ts
index b6fe378c0..295ad4776 100644
--- a/packages/modal/src/react/hooks/useWeb3Auth.ts
+++ b/packages/modal/src/react/hooks/useWeb3Auth.ts
@@ -4,10 +4,11 @@ import { useWeb3AuthInner } from "./useWeb3AuthInner";
 export type IUseWeb3Auth = Omit<IWeb3AuthInnerContext, "isMFAEnabled" | "setIsMFAEnabled" | "chainId" | "chainNamespace">;
 
 export const useWeb3Auth = (): IUseWeb3Auth => {
-  const { initError, isConnected, isInitialized, isInitializing, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
+  const { initError, isConnected, isAuthorized, isInitialized, isInitializing, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
   return {
     initError,
     isConnected,
+    isAuthorized,
     isInitialized,
     isInitializing,
     provider,
diff --git a/packages/modal/src/ui/components/BottomSheet/BottomSheet.tsx b/packages/modal/src/ui/components/BottomSheet/BottomSheet.tsx
index f001d6c0e..ab37aa60a 100644
--- a/packages/modal/src/ui/components/BottomSheet/BottomSheet.tsx
+++ b/packages/modal/src/ui/components/BottomSheet/BottomSheet.tsx
@@ -4,7 +4,7 @@ import { BottomSheetProps } from "./BottomSheet.type";
  * BottomSheet component
  * @returns BottomSheet component
  */
-function BottomSheet({ isShown, onClose, children, uiConfig }: BottomSheetProps) {
+function BottomSheet({ isShown, onClose, children, uiConfig, sheetClassName, showCloseButton = true }: BottomSheetProps) {
   const { borderRadiusType = "large" } = uiConfig;
   return (
     <>
@@ -30,27 +30,30 @@ function BottomSheet({ isShown, onClose, children, uiConfig }: BottomSheetProps)
             "w3a--rounded-[30px]": borderRadiusType === "large",
             "w3a--rounded-2xl": borderRadiusType === "medium",
             "w3a--rounded-none": borderRadiusType === "small",
-          }
+          },
+          sheetClassName
         )}
       >
-        <div className="w3a--absolute w3a--right-4 w3a--top-[16px] w3a--z-10 w3a--cursor-pointer">
-          <svg
-            width="13"
-            height="13"
-            viewBox="0 0 13 13"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            onClick={onClose}
-            className="w3a--text-app-gray-500 hover:w3a--text-app-gray-900 dark:w3a--text-app-gray-200 dark:hover:w3a--text-app-white"
-          >
-            <path
-              fillRule="evenodd"
-              clipRule="evenodd"
-              d="M0.292787 1.29299C0.480314 1.10552 0.734622 1.0002 0.999786 1.0002C1.26495 1.0002 1.51926 1.10552 1.70679 1.29299L5.99979 5.58599L10.2928 1.29299C10.385 1.19748 10.4954 1.1213 10.6174 1.06889C10.7394 1.01648 10.8706 0.988893 11.0034 0.987739C11.1362 0.986585 11.2678 1.01189 11.3907 1.06217C11.5136 1.11245 11.6253 1.1867 11.7192 1.28059C11.8131 1.37449 11.8873 1.48614 11.9376 1.60904C11.9879 1.73193 12.0132 1.86361 12.012 1.99639C12.0109 2.12917 11.9833 2.26039 11.9309 2.38239C11.8785 2.5044 11.8023 2.61474 11.7068 2.70699L7.41379 6.99999L11.7068 11.293C11.8889 11.4816 11.9897 11.7342 11.9875 11.9964C11.9852 12.2586 11.88 12.5094 11.6946 12.6948C11.5092 12.8802 11.2584 12.9854 10.9962 12.9877C10.734 12.9899 10.4814 12.8891 10.2928 12.707L5.99979 8.41399L1.70679 12.707C1.51818 12.8891 1.26558 12.9899 1.00339 12.9877C0.741188 12.9854 0.490376 12.8802 0.304968 12.6948C0.11956 12.5094 0.0143906 12.2586 0.0121121 11.9964C0.00983372 11.7342 0.110629 11.4816 0.292787 11.293L4.58579 6.99999L0.292787 2.70699C0.105316 2.51946 0 2.26515 0 1.99999C0 1.73483 0.105316 1.48052 0.292787 1.29299V1.29299Z"
-              fill="currentColor"
-            />
-          </svg>
-        </div>
+        {showCloseButton && (
+          <div className="w3a--absolute w3a--right-4 w3a--top-[16px] w3a--z-10 w3a--cursor-pointer">
+            <svg
+              width="13"
+              height="13"
+              viewBox="0 0 13 13"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+              onClick={onClose}
+              className="w3a--text-app-gray-500 hover:w3a--text-app-gray-900 dark:w3a--text-app-gray-200 dark:hover:w3a--text-app-white"
+            >
+              <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                d="M0.292787 1.29299C0.480314 1.10552 0.734622 1.0002 0.999786 1.0002C1.26495 1.0002 1.51926 1.10552 1.70679 1.29299L5.99979 5.58599L10.2928 1.29299C10.385 1.19748 10.4954 1.1213 10.6174 1.06889C10.7394 1.01648 10.8706 0.988893 11.0034 0.987739C11.1362 0.986585 11.2678 1.01189 11.3907 1.06217C11.5136 1.11245 11.6253 1.1867 11.7192 1.28059C11.8131 1.37449 11.8873 1.48614 11.9376 1.60904C11.9879 1.73193 12.0132 1.86361 12.012 1.99639C12.0109 2.12917 11.9833 2.26039 11.9309 2.38239C11.8785 2.5044 11.8023 2.61474 11.7068 2.70699L7.41379 6.99999L11.7068 11.293C11.8889 11.4816 11.9897 11.7342 11.9875 11.9964C11.9852 12.2586 11.88 12.5094 11.6946 12.6948C11.5092 12.8802 11.2584 12.9854 10.9962 12.9877C10.734 12.9899 10.4814 12.8891 10.2928 12.707L5.99979 8.41399L1.70679 12.707C1.51818 12.8891 1.26558 12.9899 1.00339 12.9877C0.741188 12.9854 0.490376 12.8802 0.304968 12.6948C0.11956 12.5094 0.0143906 12.2586 0.0121121 11.9964C0.00983372 11.7342 0.110629 11.4816 0.292787 11.293L4.58579 6.99999L0.292787 2.70699C0.105316 2.51946 0 2.26515 0 1.99999C0 1.73483 0.105316 1.48052 0.292787 1.29299V1.29299Z"
+                fill="currentColor"
+              />
+            </svg>
+          </div>
+        )}
         {children}
       </div>
     </>
diff --git a/packages/modal/src/ui/components/BottomSheet/BottomSheet.type.ts b/packages/modal/src/ui/components/BottomSheet/BottomSheet.type.ts
index a60d4a8d0..7a3c38ed1 100644
--- a/packages/modal/src/ui/components/BottomSheet/BottomSheet.type.ts
+++ b/packages/modal/src/ui/components/BottomSheet/BottomSheet.type.ts
@@ -5,4 +5,6 @@ export interface BottomSheetProps {
   uiConfig: UIConfig;
   onClose: () => void;
   children: React.ReactNode;
+  sheetClassName?: string;
+  showCloseButton?: boolean;
 }
diff --git a/packages/modal/src/ui/components/CircularLoader/CircularLoader.tsx b/packages/modal/src/ui/components/CircularLoader/CircularLoader.tsx
new file mode 100644
index 000000000..40a2729aa
--- /dev/null
+++ b/packages/modal/src/ui/components/CircularLoader/CircularLoader.tsx
@@ -0,0 +1,103 @@
+import { cn } from "../../utils";
+import type { CircularLoaderProps } from "./CircularLoader.type";
+
+function toSize(value?: number | string, fallback = 160): number | string {
+  return value ?? fallback;
+}
+
+const CircularLoader = (props: CircularLoaderProps) => {
+  const {
+    width,
+    height,
+    thickness = 12,
+    className = "",
+    children,
+    showChildren = true,
+    trackColor = "rgba(226, 232, 240, 1)", // Tailwind slate-200 equivalent
+    gradient,
+    arcSizeDeg = 36,
+    arcColors,
+  } = props;
+
+  const w = toSize(width, 160);
+  const h = toSize(height, 160);
+  const ringMask = `radial-gradient(farthest-side, transparent calc(100% - ${thickness}px), #000 calc(100% - ${thickness}px))`;
+
+  function hexToRgba(hex: string, alpha: number) {
+    const normalized = hex.replace("#", "");
+    const full =
+      normalized.length === 3
+        ? normalized
+            .split("")
+            .map((c) => c + c)
+            .join("")
+        : normalized;
+    const r = parseInt(full.substring(0, 2), 16);
+    const g = parseInt(full.substring(2, 4), 16);
+    const b = parseInt(full.substring(4, 6), 16);
+    return `rgba(${r}, ${g}, ${b}, ${alpha})`;
+  }
+
+  function withAlpha(color: string, alpha: number) {
+    if (!color) return color;
+    const c = color.trim().toLowerCase();
+    if (c.startsWith("#")) return hexToRgba(c, alpha);
+    if (c.startsWith("rgba(")) return color;
+    if (c.startsWith("rgb(")) {
+      const nums = c.slice(4, -1);
+      return `rgba(${nums}, ${alpha})`;
+    }
+    // Fallback: return the same color (alpha may be ignored by browser)
+    return color;
+  }
+
+  const arcColorGradient =
+    gradient ||
+    (arcColors
+      ? `radial-gradient(210.91% 85.29% at 14.56% 18.67%, ${withAlpha(arcColors[0], 0)} 9.5%, ${arcColors[1]} 41.82%, ${arcColors[1]} 64.83%, ${withAlpha(
+          arcColors[0],
+          0.44
+        )} 100%)`
+      : "radial-gradient(210.91% 85.29% at 14.56% 18.67%, rgba(255, 98, 58, 0.00) 9.5%, #FF623A 41.82%, #FF623A 64.83%, rgba(255, 98, 58, 0.44) 100%)");
+  const wedgeMask = `conic-gradient(#000 0deg ${arcSizeDeg}deg, transparent ${arcSizeDeg}deg 360deg)`;
+
+  return (
+    <div className={cn("w3a--relative w3a--inline-flex w3a--items-center w3a--justify-center", className)} style={{ width: w, height: h }}>
+      <div
+        className="w3a--absolute w3a--inset-0 w3a--rounded-full"
+        style={{
+          background: trackColor,
+          WebkitMaskImage: ringMask,
+          maskImage: ringMask,
+          WebkitMaskRepeat: "no-repeat",
+          maskRepeat: "no-repeat",
+        }}
+      />
+
+      <div
+        className="w3a--absolute w3a--inset-0 w3a--animate-spin"
+        style={{
+          WebkitMaskImage: wedgeMask,
+          maskImage: wedgeMask,
+          WebkitMaskRepeat: "no-repeat",
+          maskRepeat: "no-repeat",
+        }}
+      >
+        <div
+          className="w3a--absolute w3a--inset-0 w3a--rounded-full"
+          style={{
+            background: arcColorGradient,
+            WebkitMaskImage: ringMask,
+            maskImage: ringMask,
+            WebkitMaskRepeat: "no-repeat",
+            maskRepeat: "no-repeat",
+          }}
+        />
+      </div>
+
+      {showChildren && children ? <div className="w3a--relative">{children}</div> : null}
+    </div>
+  );
+};
+
+export default CircularLoader;
diff --git a/packages/modal/src/ui/components/CircularLoader/CircularLoader.type.ts b/packages/modal/src/ui/components/CircularLoader/CircularLoader.type.ts
new file mode 100644
index 000000000..5237f525a
--- /dev/null
+++ b/packages/modal/src/ui/components/CircularLoader/CircularLoader.type.ts
@@ -0,0 +1,20 @@
+import type { ReactNode } from "react";
+
+export interface CircularLoaderProps {
+  width?: number | string;
+  height?: number | string;
+  thickness?: number;
+  showChildren?: boolean;
+  children?: ReactNode;
+  className?: string;
+  trackColor?: string;
+  /** Size of the colored arc in degrees (0-360). Default: 40 */
+  arcSizeDeg?: number;
+  /** Two colors for the orange arc gradient [start, end]. */
+  arcColors?: [string, string];
+  /**
+   * CSS color stops for conic-gradient. Example:
+   * "conic-gradient(#f97316, #fdba74 320deg, transparent 320deg)"
+   */
+  gradient?: string;
+}
diff --git a/packages/modal/src/ui/components/CircularLoader/index.ts b/packages/modal/src/ui/components/CircularLoader/index.ts
new file mode 100644
index 000000000..1a427f4ec
--- /dev/null
+++ b/packages/modal/src/ui/components/CircularLoader/index.ts
@@ -0,0 +1,2 @@
+export { default } from "./CircularLoader";
+export type { CircularLoaderProps } from "./CircularLoader.type";
diff --git a/packages/modal/src/ui/components/ConnectWallet/ConnectWalletChainNamespaceSelect/ConnectWalletChainNamespaceSelect.tsx b/packages/modal/src/ui/components/ConnectWallet/ConnectWalletChainNamespaceSelect/ConnectWalletChainNamespaceSelect.tsx
index 7869d1cfd..da3202d58 100644
--- a/packages/modal/src/ui/components/ConnectWallet/ConnectWalletChainNamespaceSelect/ConnectWalletChainNamespaceSelect.tsx
+++ b/packages/modal/src/ui/components/ConnectWallet/ConnectWalletChainNamespaceSelect/ConnectWalletChainNamespaceSelect.tsx
@@ -40,7 +40,7 @@ const ConnectWalletChainNamespaceSelect = (props: ConnectWalletChainNamespaceSel
       </div>
 
       {/* Description */}
-      <p className="w3a--my-6 w3a--text-center w3a--text-sm w3a--text-app-gray-500">
+      <p className="w3a--my-6 w3a--text-center w3a--text-sm w3a--text-app-gray-500 dark:w3a--text-app-gray-400">
         {t("modal.external.select-chain-description", { wallet: wallet.displayName })}
       </p>
 
@@ -55,7 +55,9 @@ const ConnectWalletChainNamespaceSelect = (props: ConnectWalletChainNamespaceSel
             >
               <div className="w3a--flex w3a--items-center">
                 <Image imageId={imageId} hoverImageId={imageId} fallbackImageId="wallet" height="24" width="24" isButton extension="svg" />
-                <p className="w3a--ml-2 w3a--text-left w3a--text-sm first-letter:w3a--capitalize">{displayName}</p>
+                <p className="w3a--ml-2 w3a--text-left w3a--text-sm w3a--text-app-gray-900 first-letter:w3a--capitalize dark:w3a--text-app-gray-200">
+                  {displayName}
+                </p>
               </div>
               <img
                 id="chain-namespace-arrow"
diff --git a/packages/modal/src/ui/components/Loader/Loader.tsx b/packages/modal/src/ui/components/Loader/Loader.tsx
index 500d94325..7760a78fd 100644
--- a/packages/modal/src/ui/components/Loader/Loader.tsx
+++ b/packages/modal/src/ui/components/Loader/Loader.tsx
@@ -1,11 +1,13 @@
+import { WALLET_CONNECTOR_TYPE } from "@web3auth/no-modal";
 import { useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
 import { MODAL_STATUS } from "../../interfaces";
 import i18n from "../../localeImport";
+import CircularLoader from "../CircularLoader";
 import Image from "../Image";
 import PulseLoader from "../PulseLoader";
-import { ConnectedStatusType, ConnectingStatusType, ErroredStatusType, LoaderProps } from "./Loader.type";
+import { AuthorizingStatusType, ConnectedStatusType, ConnectingStatusType, ErroredStatusType, LoaderProps } from "./Loader.type";
 
 /**
  * ConnectingStatus component
@@ -88,29 +90,90 @@ function ErroredStatus(props: ErroredStatusType) {
   );
 }
 
+function AuthorizingStatus(props: AuthorizingStatusType) {
+  const [t] = useTranslation(undefined, { i18n });
+  const { connector, externalWalletsConfig, walletRegistry, handleMobileVerifyConnect } = props;
+
+  const registryItem = walletRegistry?.default?.[connector] || walletRegistry?.others?.[connector];
+  const primaryColor = registryItem?.primaryColor || "";
+
+  const handleMobileVerifyConnectClick = () => {
+    handleMobileVerifyConnect({ connector: connector as WALLET_CONNECTOR_TYPE });
+  };
+
+  return (
+    <div className="w3a--flex w3a--size-full w3a--flex-col w3a--items-center w3a--justify-between w3a--gap-y-6">
+      <p className="w3a--p-2 w3a--text-center w3a--text-base w3a--font-semibold w3a--text-app-gray-900 dark:w3a--text-app-white">
+        {t("modal.loader.authorizing-header", { connector: externalWalletsConfig[connector].label })}
+      </p>
+      <div className="w3a--flex w3a--justify-center">
+        <CircularLoader width={95} height={95} thickness={6} arcSizeDeg={100} arcColors={primaryColor ? [primaryColor, primaryColor] : undefined}>
+          <Image imageId={`login-${connector}`} hoverImageId={`login-${connector}`} height="45" width="45" />
+        </CircularLoader>
+      </div>
+      <p className="w3a--text-center w3a--text-sm w3a--text-app-gray-500 dark:w3a--text-app-gray-400">{t("modal.loader.authorizing-message")}</p>
+      <button
+        onClick={handleMobileVerifyConnectClick}
+        className="w3a--w-full w3a--rounded-xl w3a--bg-app-gray-100 w3a--p-2 w3a--py-3 w3a--text-center w3a--text-sm w3a--text-app-gray-900 dark:w3a--bg-app-gray-800 dark:w3a--text-app-white md:w3a--hidden"
+      >
+        {t("modal.loader.authorizing-verify-btn")}
+      </button>
+    </div>
+  );
+}
+
 /**
  * Loader component
  * @param props - LoaderProps
  * @returns Loader component
  */
 function Loader(props: LoaderProps) {
-  const { connector, connectorName, modalStatus, onClose, appLogo, message } = props;
+  const {
+    connector,
+    connectorName,
+    modalStatus,
+    onClose,
+    appLogo,
+    message,
+    isConnectAndSignAuthenticationMode,
+    externalWalletsConfig,
+    walletRegistry,
+    handleMobileVerifyConnect,
+  } = props;
+
+  const isConnectedAccordingToAuthenticationMode = useMemo(
+    () =>
+      (!isConnectAndSignAuthenticationMode && modalStatus === MODAL_STATUS.CONNECTED) ||
+      (isConnectAndSignAuthenticationMode && modalStatus === MODAL_STATUS.AUTHORIZED),
+    [modalStatus, isConnectAndSignAuthenticationMode]
+  );
 
   useEffect(() => {
-    if (modalStatus === MODAL_STATUS.CONNECTED) {
-      setTimeout(() => {
+    if (isConnectedAccordingToAuthenticationMode) {
+      const timeout = setTimeout(() => {
         onClose();
       }, 1000);
+
+      return () => clearTimeout(timeout);
     }
-  }, [modalStatus, onClose]);
+  }, [isConnectedAccordingToAuthenticationMode, onClose]);
 
   return (
     <div className="w3a--flex w3a--h-full w3a--flex-1 w3a--flex-col w3a--items-center w3a--justify-center w3a--gap-y-4">
       {modalStatus === MODAL_STATUS.CONNECTING && <ConnectingStatus connector={connector} connectorName={connectorName} appLogo={appLogo} />}
 
-      {modalStatus === MODAL_STATUS.CONNECTED && <ConnectedStatus message={message} />}
+      {isConnectedAccordingToAuthenticationMode && <ConnectedStatus message={message} />}
 
       {modalStatus === MODAL_STATUS.ERRORED && <ErroredStatus message={message} />}
+
+      {modalStatus === MODAL_STATUS.AUTHORIZING && (
+        <AuthorizingStatus
+          connector={connector}
+          externalWalletsConfig={externalWalletsConfig}
+          walletRegistry={walletRegistry}
+          handleMobileVerifyConnect={handleMobileVerifyConnect}
+        />
+      )}
     </div>
   );
 }
diff --git a/packages/modal/src/ui/components/Loader/Loader.type.ts b/packages/modal/src/ui/components/Loader/Loader.type.ts
index d43cb36f1..4ca73ecef 100644
--- a/packages/modal/src/ui/components/Loader/Loader.type.ts
+++ b/packages/modal/src/ui/components/Loader/Loader.type.ts
@@ -1,12 +1,18 @@
+import { BaseConnectorConfig, WALLET_CONNECTOR_TYPE, WalletRegistry } from "@web3auth/no-modal";
+
 import type { ModalStatusType } from "../../interfaces";
 
 export interface LoaderProps {
+  externalWalletsConfig: Record<string, BaseConnectorConfig>;
+  walletRegistry?: WalletRegistry;
   message?: string;
   appLogo?: string;
   connector: string;
   connectorName: string;
   modalStatus: ModalStatusType;
   onClose: () => void;
+  isConnectAndSignAuthenticationMode: boolean;
+  handleMobileVerifyConnect: (params: { connector: WALLET_CONNECTOR_TYPE }) => void;
 }
 
 export type ConnectingStatusType = Pick<LoaderProps, "connectorName" | "appLogo" | "connector">;
@@ -14,3 +20,5 @@ export type ConnectingStatusType = Pick<LoaderProps, "connectorName" | "appLogo"
 export type ConnectedStatusType = Pick<LoaderProps, "message">;
 
 export type ErroredStatusType = Pick<LoaderProps, "message">;
+
+export type AuthorizingStatusType = Pick<LoaderProps, "connector" | "externalWalletsConfig" | "walletRegistry" | "handleMobileVerifyConnect">;
diff --git a/packages/modal/src/ui/components/Root/Root.tsx b/packages/modal/src/ui/components/Root/Root.tsx
index d3e66d8c1..15607d8de 100644
--- a/packages/modal/src/ui/components/Root/Root.tsx
+++ b/packages/modal/src/ui/components/Root/Root.tsx
@@ -25,6 +25,7 @@ function Root(props: RootProps) {
     setModalState,
     modalState,
     handleExternalWalletBtnClick,
+    handleMobileVerifyConnect,
     chainNamespaces,
     walletRegistry,
     appLogo,
@@ -42,6 +43,7 @@ function Root(props: RootProps) {
     preHandleExternalWalletClick,
     uiConfig,
     deviceDetails,
+    isConnectAndSignAuthenticationMode,
   } = props;
 
   const {
@@ -446,6 +448,10 @@ function Root(props: RootProps) {
                 modalStatus={modalState.status}
                 onClose={onCloseLoader}
                 appLogo={appLogo}
+                isConnectAndSignAuthenticationMode={isConnectAndSignAuthenticationMode}
+                externalWalletsConfig={modalState.externalWalletsConfig}
+                walletRegistry={walletRegistry}
+                handleMobileVerifyConnect={handleMobileVerifyConnect}
               />
             ) : (
               <>
diff --git a/packages/modal/src/ui/components/Root/Root.type.ts b/packages/modal/src/ui/components/Root/Root.type.ts
index fcd969196..e79a89e64 100644
--- a/packages/modal/src/ui/components/Root/Root.type.ts
+++ b/packages/modal/src/ui/components/Root/Root.type.ts
@@ -1,4 +1,4 @@
-import type { ChainNamespaceType, WalletRegistry } from "@web3auth/no-modal";
+import type { ChainNamespaceType, WALLET_CONNECTOR_TYPE, WalletRegistry } from "@web3auth/no-modal";
 
 import { browser, ModalState, os, platform, SocialLoginEventType, SocialLoginsConfig, UIConfig } from "../../interfaces";
 
@@ -24,4 +24,6 @@ export interface RootProps {
   preHandleExternalWalletClick: (params: { connector: string; chainNamespace?: ChainNamespaceType }) => void;
   setModalState: (state: ModalState) => void;
   onCloseLoader: () => void;
+  isConnectAndSignAuthenticationMode: boolean;
+  handleMobileVerifyConnect: (params: { connector: WALLET_CONNECTOR_TYPE }) => void;
 }
diff --git a/packages/modal/src/ui/components/Widget/Widget.tsx b/packages/modal/src/ui/components/Widget/Widget.tsx
index a9598bf33..0b4591fbb 100644
--- a/packages/modal/src/ui/components/Widget/Widget.tsx
+++ b/packages/modal/src/ui/components/Widget/Widget.tsx
@@ -1,5 +1,13 @@
 import { AUTH_CONNECTION, AUTH_CONNECTION_TYPE, BUILD_ENV, WEB3AUTH_NETWORK } from "@web3auth/auth";
-import { cloneDeep, CONNECTOR_NAMES, log, WALLET_CONNECTOR_TYPE, WALLET_CONNECTORS, WIDGET_TYPE } from "@web3auth/no-modal";
+import {
+  cloneDeep,
+  CONNECTOR_INITIAL_AUTHENTICATION_MODE,
+  CONNECTOR_NAMES,
+  log,
+  WALLET_CONNECTOR_TYPE,
+  WALLET_CONNECTORS,
+  WIDGET_TYPE,
+} from "@web3auth/no-modal";
 import deepmerge from "deepmerge";
 import { useEffect, useMemo, useState } from "react";
 
@@ -15,6 +23,7 @@ function Widget(props: WidgetProps) {
     stateListener,
     handleSocialLoginClick,
     handleExternalWalletClick,
+    handleMobileVerifyConnect,
     handleShowExternalWallets,
     closeModal,
     appLogo,
@@ -23,6 +32,7 @@ function Widget(props: WidgetProps) {
     walletRegistry,
     uiConfig,
     deviceDetails,
+    initialAuthenticationMode,
   } = props;
 
   const { widgetType } = uiConfig;
@@ -55,6 +65,11 @@ function Widget(props: WidgetProps) {
     authBuildEnv: BUILD_ENV.PRODUCTION,
   });
 
+  const isConnectAndSignAuthenticationMode = useMemo(
+    () => initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+    [initialAuthenticationMode]
+  );
+
   useEffect(() => {
     setModalState((prev) => ({ ...prev, modalVisibility: visible }));
   }, [visible]);
@@ -155,7 +170,14 @@ function Widget(props: WidgetProps) {
   };
 
   const onCloseLoader = () => {
-    if (modalState.status === MODAL_STATUS.CONNECTED) {
+    if (!isConnectAndSignAuthenticationMode && modalState.status === MODAL_STATUS.CONNECTED) {
+      setModalState({
+        ...modalState,
+        modalVisibility: false,
+        externalWalletsVisibility: false,
+      });
+    }
+    if (isConnectAndSignAuthenticationMode && modalState.status === MODAL_STATUS.AUTHORIZED) {
       setModalState({
         ...modalState,
         modalVisibility: false,
@@ -173,7 +195,10 @@ function Widget(props: WidgetProps) {
 
   const showCloseIcon = useMemo(() => {
     return (
-      modalState.status === MODAL_STATUS.INITIALIZED || modalState.status === MODAL_STATUS.CONNECTED || modalState.status === MODAL_STATUS.ERRORED
+      modalState.status === MODAL_STATUS.INITIALIZED ||
+      modalState.status === MODAL_STATUS.CONNECTED ||
+      modalState.status === MODAL_STATUS.ERRORED ||
+      modalState.status === MODAL_STATUS.AUTHORIZED
     );
   }, [modalState.status]);
 
@@ -223,6 +248,8 @@ function Widget(props: WidgetProps) {
             isSmsPasswordLessLoginVisible={isSmsPasswordLessLoginVisible}
             uiConfig={uiConfig}
             deviceDetails={deviceDetails}
+            isConnectAndSignAuthenticationMode={isConnectAndSignAuthenticationMode}
+            handleMobileVerifyConnect={handleMobileVerifyConnect}
           />
         )}
       </Modal>
@@ -255,6 +282,8 @@ function Widget(props: WidgetProps) {
           isSmsPasswordLessLoginVisible={isSmsPasswordLessLoginVisible}
           uiConfig={uiConfig}
           deviceDetails={deviceDetails}
+          isConnectAndSignAuthenticationMode={isConnectAndSignAuthenticationMode}
+          handleMobileVerifyConnect={handleMobileVerifyConnect}
         />
       )}
     </Embed>
diff --git a/packages/modal/src/ui/components/Widget/Widget.type.ts b/packages/modal/src/ui/components/Widget/Widget.type.ts
index 5a57636fd..ecc605f72 100644
--- a/packages/modal/src/ui/components/Widget/Widget.type.ts
+++ b/packages/modal/src/ui/components/Widget/Widget.type.ts
@@ -1,5 +1,5 @@
 import { SafeEventEmitter } from "@web3auth/auth";
-import { ChainNamespaceType, WalletRegistry } from "@web3auth/no-modal";
+import { ChainNamespaceType, ConnectorInitialAuthenticationModeType, WALLET_CONNECTOR_TYPE, WalletRegistry } from "@web3auth/no-modal";
 
 import { browser, ExternalWalletEventType, os, platform, SocialLoginEventType, StateEmitterEvents, UIConfig } from "../../interfaces";
 
@@ -10,9 +10,11 @@ export interface WidgetProps {
   chainNamespaces: ChainNamespaceType[];
   walletRegistry?: WalletRegistry;
   uiConfig: UIConfig;
+  initialAuthenticationMode: ConnectorInitialAuthenticationModeType;
   deviceDetails: { platform: platform; browser: browser; os: os };
   handleSocialLoginClick: (params: SocialLoginEventType) => void;
   handleExternalWalletClick: (params: ExternalWalletEventType) => void;
+  handleMobileVerifyConnect: (params: { connector: WALLET_CONNECTOR_TYPE }) => void;
   handleShowExternalWallets: (externalWalletsInitialized: boolean) => void;
   closeModal: () => void;
 }
diff --git a/packages/modal/src/ui/i18n/english.json b/packages/modal/src/ui/i18n/english.json
index c2c1515d4..d244dd401 100644
--- a/packages/modal/src/ui/i18n/english.json
+++ b/packages/modal/src/ui/i18n/english.json
@@ -50,6 +50,9 @@
     "header-title": "Sign in",
     "header-tooltip-desc": "The wallet serves as an account to store and manage your digital assets on the blockchain.",
     "header-tooltip-title": "Wallet",
+    "loader.authorizing-header": "Verify on {{connector}}",
+    "loader.authorizing-message": "We’ve sent a request to your wallet. Verify on your wallet to confirm that you own this wallet.",
+    "loader.authorizing-verify-btn": " Click here to verify",
     "network.add-request": "This site is requesting to add a network",
     "network.cancel": "Cancel",
     "network.from": "From",
diff --git a/packages/modal/src/ui/i18n/french.json b/packages/modal/src/ui/i18n/french.json
index 12b70fc72..077d936c8 100644
--- a/packages/modal/src/ui/i18n/french.json
+++ b/packages/modal/src/ui/i18n/french.json
@@ -48,6 +48,9 @@
     "header-title": "Se connecter",
     "header-tooltip-desc": "Le portefeuille sert de compte pour stocker et gérer vos actifs numériques sur la blockchain.",
     "header-tooltip-title": "Portefeuille",
+    "loader.authorizing-header": "Vérifier sur {{connector}}",
+    "loader.authorizing-message": "Nous avons envoyé une demande à votre portefeuille. Vérifiez votre portefeuille pour confirmer que vous possédez ce portefeuille.",
+    "loader.authorizing-verify-btn": "Cliquez ici pour vérifier",
     "network.add-request": "Ce site demande d'ajouter un réseau",
     "network.cancel": "Annuler",
     "network.from": "De",
diff --git a/packages/modal/src/ui/i18n/german.json b/packages/modal/src/ui/i18n/german.json
index 45effd898..f7e1435cd 100644
--- a/packages/modal/src/ui/i18n/german.json
+++ b/packages/modal/src/ui/i18n/german.json
@@ -50,6 +50,9 @@
     "header-title": "Einloggen",
     "header-tooltip-desc": "Die Brieftasche dient als Konto zum Speichern und Verwalten Ihrer digitalen Assets auf der Blockchain.",
     "header-tooltip-title": "Brieftasche",
+    "loader.authorizing-header": "Überprüfen auf {{connector}}",
+    "loader.authorizing-message": "Wir haben eine Anfrage an Ihr Wallet gesendet. Überprüfen Sie Ihr Wallet, um zu bestätigen, dass Sie dieses Wallet besitzen.",
+    "loader.authorizing-verify-btn": "Klicken Sie hier, um zu verifizieren",
     "network.add-request": "Diese Website fordert das Hinzufügen eines Netzwerks an",
     "network.cancel": "Abbrechen",
     "network.from": "Von",
diff --git a/packages/modal/src/ui/i18n/japanese.json b/packages/modal/src/ui/i18n/japanese.json
index 837788402..9ac689818 100644
--- a/packages/modal/src/ui/i18n/japanese.json
+++ b/packages/modal/src/ui/i18n/japanese.json
@@ -50,6 +50,9 @@
     "header-title": "ログイン",
     "header-tooltip-desc": "ウォレットは、ブロックチェーン上でデジタル資産を保存および管理するためのアカウントとして機能します。",
     "header-tooltip-title": "ウォレット",
+    "loader.authorizing-header": "{{connector}}で確認",
+    "loader.authorizing-message": "ウォレットにリクエストを送信しました。ウォレットで確認して、このウォレットを所有していることを確認してください。",
+    "loader.authorizing-verify-btn": "確認するにはここをクリックしてください",
     "network.add-request": "このサイトはネットワークの追加をリクエストしています",
     "network.cancel": "キャンセル",
     "network.from": "から",
diff --git a/packages/modal/src/ui/i18n/korean.json b/packages/modal/src/ui/i18n/korean.json
index 0275d3157..ffba43ee4 100644
--- a/packages/modal/src/ui/i18n/korean.json
+++ b/packages/modal/src/ui/i18n/korean.json
@@ -50,6 +50,9 @@
     "header-title": "로그인",
     "header-tooltip-desc": "이 지갑은 블록체인 상에서 디지털 자산을 보관하고 관리하는 데 사용되는 계정입니다.",
     "header-tooltip-title": "지갑",
+    "loader.authorizing-header": "{{connector}}로 확인",
+    "loader.authorizing-message": "월렛에 요청을 보냈습니다. 월렛에서 확인하여 이 월렛을 소유하고 있는지 확인해주세요.",
+    "loader.authorizing-verify-btn": "확인하려면 여기를 클릭하세요",
     "network.add-request": "이 사이트에서 네트워크 추가를 요청하고 있습니다",
     "network.cancel": "취소",
     "network.from": "보낸 사람",
diff --git a/packages/modal/src/ui/i18n/mandarin.json b/packages/modal/src/ui/i18n/mandarin.json
index 0b54e9c12..294018129 100644
--- a/packages/modal/src/ui/i18n/mandarin.json
+++ b/packages/modal/src/ui/i18n/mandarin.json
@@ -50,6 +50,9 @@
     "header-title": "登录",
     "header-tooltip-desc": "钱包作为一个账户用于在区块链上存储和管理您的数字资产。",
     "header-tooltip-title": "钱包",
+    "loader.authorizing-header": "{{connector}}验证",
+    "loader.authorizing-message": "我们已经向您的钱包发送了请求。请在您的钱包上确认，以确认您拥有此钱包。",
+    "loader.authorizing-verify-btn": "点击此处进行验证",
     "network.add-request": "此站点正在请求添加网络",
     "network.cancel": "取消",
     "network.from": "从",
diff --git a/packages/modal/src/ui/i18n/portuguese.json b/packages/modal/src/ui/i18n/portuguese.json
index fdb91d0db..571636a7d 100644
--- a/packages/modal/src/ui/i18n/portuguese.json
+++ b/packages/modal/src/ui/i18n/portuguese.json
@@ -50,6 +50,9 @@
     "header-title": "Entrar",
     "header-tooltip-desc": "A carteira serve como uma conta para armazenar e gerenciar seus ativos digitais na blockchain.",
     "header-tooltip-title": "Carteira",
+    "loader.authorizing-header": "Verificar em {{connector}}",
+    "loader.authorizing-message": "Enviamos uma solicitação para seu portfólio. Verifique no seu portfólio para confirmar que você possui este portfólio.",
+    "loader.authorizing-verify-btn": "Clique aqui para verificar",
     "network.add-request": "Este site está solicitando adicionar uma rede",
     "network.cancel": "Cancelar",
     "network.from": "De",
diff --git a/packages/modal/src/ui/i18n/spanish.json b/packages/modal/src/ui/i18n/spanish.json
index 3c1143c72..64b2f6c05 100644
--- a/packages/modal/src/ui/i18n/spanish.json
+++ b/packages/modal/src/ui/i18n/spanish.json
@@ -50,6 +50,9 @@
     "header-title": "Iniciar sesión",
     "header-tooltip-desc": "La billetera sirve como una cuenta para almacenar y administrar sus activos digitales en la blockchain.",
     "header-tooltip-title": "Billetera",
+    "loader.authorizing-header": "Verificar en {{connector}}",
+    "loader.authorizing-message": "Hemos enviado una solicitud a su cartera. Verifique en su cartera para confirmar que posee esta cartera.",
+    "loader.authorizing-verify-btn": "Haga clic aquí para verificar",
     "network.add-request": "Este sitio está solicitando agregar una red",
     "network.cancel": "Cancelar",
     "network.from": "De",
diff --git a/packages/modal/src/ui/i18n/turkish.json b/packages/modal/src/ui/i18n/turkish.json
index 000cae05a..d8a87e9da 100644
--- a/packages/modal/src/ui/i18n/turkish.json
+++ b/packages/modal/src/ui/i18n/turkish.json
@@ -50,6 +50,9 @@
     "header-title": "Giriş yap",
     "header-tooltip-desc": "Cüzdan, dijital varlıklarınızı blockchain'de saklama ve yönetme görevi görür.",
     "header-tooltip-title": "Cüzdan",
+    "loader.authorizing-header": "{{connector}} ile doğrula",
+    "loader.authorizing-message": "Biz size bir istek gönderdik. Bu cüzdanınız olduğunu doğrulamak için cüzdanınızda doğrulayın.",
+    "loader.authorizing-verify-btn": "Doğrulamak için buraya tıklayın",
     "network.add-request": "Bu site bir ağ eklemek istiyor",
     "network.cancel": "İptal",
     "network.from": "Nereden",
diff --git a/packages/modal/src/ui/interfaces.ts b/packages/modal/src/ui/interfaces.ts
index d1f4020e0..9905becd0 100644
--- a/packages/modal/src/ui/interfaces.ts
+++ b/packages/modal/src/ui/interfaces.ts
@@ -13,6 +13,7 @@ import {
   type AuthLoginParams,
   type BaseConnectorConfig,
   type ChainNamespaceType,
+  type ConnectorInitialAuthenticationModeType,
   type LoginMethodConfig,
   type LoginModalConfig,
   type UIConfig as CoreUIConfig,
@@ -76,6 +77,7 @@ export type ModalLoginParams = Pick<
 };
 
 export interface LoginModalProps extends UIConfig {
+  initialAuthenticationMode: ConnectorInitialAuthenticationModeType;
   chainNamespaces: ChainNamespaceType[];
   walletRegistry: WalletRegistry;
   web3authClientId: string;
@@ -92,6 +94,7 @@ export interface LoginModalCallbacks {
     loginParams: { chainNamespace: ChainNamespaceType };
   }) => Promise<void>;
   onModalVisibility: (visibility: boolean) => Promise<void>;
+  onMobileVerifyConnect: (params: { connector: WALLET_CONNECTOR_TYPE }) => Promise<void>;
 }
 
 export const LOGIN_MODAL_EVENTS = {
@@ -109,6 +112,8 @@ export const MODAL_STATUS = {
   CONNECTED: "connected",
   CONNECTING: "connecting",
   ERRORED: "errored",
+  AUTHORIZING: "authorizing",
+  AUTHORIZED: "authorized",
 } as const;
 export type ModalStatusType = (typeof MODAL_STATUS)[keyof typeof MODAL_STATUS];
 
diff --git a/packages/modal/src/ui/loginModal.tsx b/packages/modal/src/ui/loginModal.tsx
index 212f43b5e..80b2f97d1 100644
--- a/packages/modal/src/ui/loginModal.tsx
+++ b/packages/modal/src/ui/loginModal.tsx
@@ -2,13 +2,14 @@
 
 import "./css/index.css";
 
-import { applyWhiteLabelTheme, LANGUAGES, SafeEventEmitter } from "@web3auth/auth";
+import { applyWhiteLabelTheme, LANGUAGES, SafeEventEmitter, THEME_MODES } from "@web3auth/auth";
 import {
   type Analytics,
   ANALYTICS_EVENTS,
   type BaseConnectorConfig,
   type ChainNamespaceType,
   CONNECTOR_EVENTS,
+  CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   getWhitelabelAnalyticsProperties,
   type IConnectorDataEvent,
   log,
@@ -90,7 +91,7 @@ export class LoginModal {
 
     if (!uiConfig.logoDark) this.uiConfig.logoDark = DEFAULT_LOGO_DARK;
     if (!uiConfig.logoLight) this.uiConfig.logoLight = DEFAULT_LOGO_LIGHT;
-    if (!uiConfig.mode) this.uiConfig.mode = "light";
+    if (!uiConfig.mode) this.uiConfig.mode = THEME_MODES.light;
     if (!uiConfig.modalZIndex) this.uiConfig.modalZIndex = "99998";
     if (typeof uiConfig.displayErrorsOnModal === "undefined") this.uiConfig.displayErrorsOnModal = true;
     if (!uiConfig.appName) this.uiConfig.appName = "Web3Auth";
@@ -98,6 +99,7 @@ export class LoginModal {
     if (!uiConfig.primaryButton) this.uiConfig.primaryButton = "socialLogin";
     if (!uiConfig.defaultLanguage) this.uiConfig.defaultLanguage = getUserLanguage(uiConfig.defaultLanguage);
     if (!uiConfig.widgetType) this.uiConfig.widgetType = WIDGET_TYPE.MODAL;
+    if (!uiConfig.initialAuthenticationMode) this.uiConfig.initialAuthenticationMode = CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_ONLY;
 
     if (uiConfig.widgetType === WIDGET_TYPE.EMBED && !uiConfig.targetId) {
       log.error("targetId is required for embed widget");
@@ -266,9 +268,11 @@ export class LoginModal {
               deviceDetails={this.deviceDetails}
               handleShowExternalWallets={this.handleShowExternalWallets}
               handleExternalWalletClick={this.handleExternalWalletClick}
+              handleMobileVerifyConnect={this.handleMobileVerifyConnect}
               handleSocialLoginClick={this.handleSocialLoginClick}
               closeModal={this.closeModal}
               uiConfig={this.uiConfig}
+              initialAuthenticationMode={this.uiConfig.initialAuthenticationMode}
             />
           </AnalyticsContext.Provider>
         </ThemedContext.Provider>
@@ -368,6 +372,14 @@ export class LoginModal {
     }
   };
 
+  private handleMobileVerifyConnect = (params: { connector: WALLET_CONNECTOR_TYPE }) => {
+    log.info("mobile verify connect clicked", params);
+    const { connector } = params;
+    if (this.callbacks.onMobileVerifyConnect) {
+      this.callbacks.onMobileVerifyConnect({ connector });
+    }
+  };
+
   private handleSocialLoginClick = (params: SocialLoginEventType) => {
     log.info("social login clicked", params);
     const { connector, loginParams } = params;
@@ -458,5 +470,11 @@ export class LoginModal {
     listener.on(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, (connectorData: IConnectorDataEvent) => {
       this.handleConnectorData(connectorData);
     });
+    listener.on(CONNECTOR_EVENTS.AUTHORIZING, () => {
+      this.setState({ status: MODAL_STATUS.AUTHORIZING });
+    });
+    listener.on(CONNECTOR_EVENTS.AUTHORIZED, () => {
+      this.setState({ status: MODAL_STATUS.AUTHORIZED });
+    });
   };
 }
diff --git a/packages/modal/src/vue/WalletServicesInnerProvider.ts b/packages/modal/src/vue/WalletServicesInnerProvider.ts
index ab18f4e5a..42fdb4fb9 100644
--- a/packages/modal/src/vue/WalletServicesInnerProvider.ts
+++ b/packages/modal/src/vue/WalletServicesInnerProvider.ts
@@ -28,7 +28,7 @@ export const WalletServicesInnerProvider = defineComponent({
     watch(isConnected, (newIsConnected) => {
       if (newIsConnected) {
         const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES) as WalletServicesPluginType;
-        if (!walletServicesPlugin.value) walletServicesPlugin.value = plugin;
+        walletServicesPlugin.value = plugin;
         // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
         if (walletServicesPlugin.value?.status === CONNECTOR_STATUS.CONNECTED) ready.value = true;
       }
diff --git a/packages/modal/src/vue/Web3AuthProvider.ts b/packages/modal/src/vue/Web3AuthProvider.ts
index 63b4311c3..e8781a5e8 100644
--- a/packages/modal/src/vue/Web3AuthProvider.ts
+++ b/packages/modal/src/vue/Web3AuthProvider.ts
@@ -4,6 +4,7 @@ import {
   CONNECTOR_STATUS,
   type CONNECTOR_STATUS_TYPE,
   type IProvider,
+  log,
   WalletInitializationError,
   Web3AuthContextKey,
 } from "@web3auth/no-modal";
@@ -21,6 +22,7 @@ export const Web3AuthProvider = defineComponent({
     const provider = ref<IProvider | null>(null);
     const isMFAEnabled = ref(false);
     const status = ref<CONNECTOR_STATUS_TYPE | null>(null);
+    const isAuthorized = ref(false);
 
     const isInitializing = ref(false);
     const initError = ref<Error | null>(null);
@@ -44,6 +46,7 @@ export const Web3AuthProvider = defineComponent({
           provider.value = null;
           isMFAEnabled.value = false;
           isConnected.value = false;
+          isAuthorized.value = false;
           status.value = null;
         };
 
@@ -78,6 +81,7 @@ export const Web3AuthProvider = defineComponent({
             isInitializing.value = true;
             await newWeb3Auth.init({ signal: controller.signal });
           } catch (error) {
+            log.error("Error initializing web3auth", error);
             initError.value = error as Error;
           } finally {
             isInitializing.value = false;
@@ -113,6 +117,7 @@ export const Web3AuthProvider = defineComponent({
           isConnected.value = false;
           provider.value = null;
           isMFAEnabled.value = false;
+          isAuthorized.value = false;
         };
 
         const connectingListener = () => {
@@ -121,9 +126,13 @@ export const Web3AuthProvider = defineComponent({
 
         const errorListener = () => {
           status.value = web3Auth.value!.status;
-          if (isConnected.value) {
-            isConnected.value = false;
-            provider.value = null;
+        };
+
+        const authorizedListener = () => {
+          status.value = web3Auth.value!.status;
+          if (web3Auth.value!.status === CONNECTOR_STATUS.AUTHORIZED) {
+            isConnected.value = true;
+            isAuthorized.value = true;
           }
         };
 
@@ -136,6 +145,7 @@ export const Web3AuthProvider = defineComponent({
           prevWeb3Auth.off(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.READY, readyListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+          prevWeb3Auth.off(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -149,6 +159,7 @@ export const Web3AuthProvider = defineComponent({
           newWeb3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+          newWeb3Auth.on(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -162,6 +173,7 @@ export const Web3AuthProvider = defineComponent({
     provide<IWeb3AuthInnerContext>(Web3AuthContextKey, {
       web3Auth,
       isConnected,
+      isAuthorized,
       isInitialized,
       provider,
       status,
diff --git a/packages/modal/src/vue/composables/useCheckout.ts b/packages/modal/src/vue/composables/useCheckout.ts
index c3c848d2c..286409b54 100644
--- a/packages/modal/src/vue/composables/useCheckout.ts
+++ b/packages/modal/src/vue/composables/useCheckout.ts
@@ -1,5 +1,5 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
-import { WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
@@ -24,6 +24,7 @@ export const useCheckout = (): IUseCheckout => {
 
       await plugin.value.showCheckout(showCheckoutParams);
     } catch (err) {
+      log.error("Error showing checkout", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useEnableMFA.ts b/packages/modal/src/vue/composables/useEnableMFA.ts
index b84c712a9..214d74948 100644
--- a/packages/modal/src/vue/composables/useEnableMFA.ts
+++ b/packages/modal/src/vue/composables/useEnableMFA.ts
@@ -1,4 +1,4 @@
-import { WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -21,6 +21,7 @@ export const useEnableMFA = (): IUseEnableMFA => {
       loading.value = true;
       await web3Auth.value.enableMFA();
     } catch (err) {
+      log.error("Error enabling MFA", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useFunding.ts b/packages/modal/src/vue/composables/useFunding.ts
index dfe0dd28b..ee99d2671 100644
--- a/packages/modal/src/vue/composables/useFunding.ts
+++ b/packages/modal/src/vue/composables/useFunding.ts
@@ -1,5 +1,5 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
-import { WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
@@ -24,6 +24,7 @@ export const useFunding = (): IUseFunding => {
 
       await plugin.value.showFunding(showFundingParams);
     } catch (err) {
+      log.error("Error showing funding", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useIdentityToken.ts b/packages/modal/src/vue/composables/useIdentityToken.ts
index 37d599b01..8fa5a52bb 100644
--- a/packages/modal/src/vue/composables/useIdentityToken.ts
+++ b/packages/modal/src/vue/composables/useIdentityToken.ts
@@ -1,4 +1,4 @@
-import { WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref, watch } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = (): IUseIdentityToken => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isAuthorized } = useWeb3AuthInner();
   const loading = ref(false);
   const error = ref<Web3AuthError | null>(null);
   const token = ref<string | null>(null);
@@ -27,17 +27,26 @@ export const useIdentityToken = (): IUseIdentityToken => {
       }
       return result?.idToken;
     } catch (err) {
+      log.error("Error getting identity token", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
     }
   };
 
-  watch(isConnected, (newIsConnected) => {
-    if (!newIsConnected && token.value) {
-      token.value = null;
-    }
-  });
+  watch(
+    isAuthorized,
+    (newIsAuthorized) => {
+      if (!web3Auth.value) return;
+      if (!newIsAuthorized && token.value) {
+        token.value = null;
+      }
+      if (newIsAuthorized && !token.value) {
+        token.value = web3Auth.value.idToken;
+      }
+    },
+    { immediate: true }
+  );
 
   return {
     loading,
diff --git a/packages/modal/src/vue/composables/useManageMFA.ts b/packages/modal/src/vue/composables/useManageMFA.ts
index 1967bd1a4..86a136a1e 100644
--- a/packages/modal/src/vue/composables/useManageMFA.ts
+++ b/packages/modal/src/vue/composables/useManageMFA.ts
@@ -1,4 +1,4 @@
-import { WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -21,6 +21,7 @@ export const useManageMFA = (): IUseManageMFA => {
       loading.value = true;
       await web3Auth.value.manageMFA();
     } catch (err) {
+      log.error("Error managing MFA", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useReceive.ts b/packages/modal/src/vue/composables/useReceive.ts
index 9bb6116f7..d55a95758 100644
--- a/packages/modal/src/vue/composables/useReceive.ts
+++ b/packages/modal/src/vue/composables/useReceive.ts
@@ -1,5 +1,5 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
-import { WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
@@ -24,6 +24,7 @@ export const useReceive = (): IUseReceive => {
 
       await plugin.value.showReceive(showReceiveParams);
     } catch (err) {
+      log.error("Error showing receive", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useSwap.ts b/packages/modal/src/vue/composables/useSwap.ts
index d0d661ed4..e95872813 100644
--- a/packages/modal/src/vue/composables/useSwap.ts
+++ b/packages/modal/src/vue/composables/useSwap.ts
@@ -1,5 +1,5 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
-import { WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
@@ -24,6 +24,7 @@ export const useSwap = (): IUseSwap => {
 
       await plugin.value.showSwap(showSwapParams);
     } catch (err) {
+      log.error("Error showing swap", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useSwitchChain.ts b/packages/modal/src/vue/composables/useSwitchChain.ts
index 64ee86b11..b96a75f72 100644
--- a/packages/modal/src/vue/composables/useSwitchChain.ts
+++ b/packages/modal/src/vue/composables/useSwitchChain.ts
@@ -1,4 +1,4 @@
-import { WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -21,6 +21,7 @@ export const useSwitchChain = (): IUseSwitchChain => {
       loading.value = true;
       await web3Auth.value.switchChain(chainParams);
     } catch (err) {
+      log.error("Error switching chain", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useWalletConnectScanner.ts b/packages/modal/src/vue/composables/useWalletConnectScanner.ts
index 7b4d2cb2b..fbace5e99 100644
--- a/packages/modal/src/vue/composables/useWalletConnectScanner.ts
+++ b/packages/modal/src/vue/composables/useWalletConnectScanner.ts
@@ -1,5 +1,5 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
-import { WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
@@ -24,6 +24,7 @@ export const useWalletConnectScanner = (): IUseWalletConnectScanner => {
 
       await plugin.value.showWalletConnectScanner(showWalletConnectScannerParams);
     } catch (err) {
+      log.error("Error showing wallet connect scanner", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useWalletUI.ts b/packages/modal/src/vue/composables/useWalletUI.ts
index bf9ddc52c..d62348a19 100644
--- a/packages/modal/src/vue/composables/useWalletUI.ts
+++ b/packages/modal/src/vue/composables/useWalletUI.ts
@@ -1,5 +1,5 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
-import { WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletServicesPluginError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
@@ -24,6 +24,7 @@ export const useWalletUI = (): IUseWalletUI => {
 
       await plugin.value.showWalletUi(showWalletUiParams);
     } catch (err) {
+      log.error("Error showing wallet UI", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useWeb3AuthConnect.ts b/packages/modal/src/vue/composables/useWeb3AuthConnect.ts
index 063933f59..d83b7ebce 100644
--- a/packages/modal/src/vue/composables/useWeb3AuthConnect.ts
+++ b/packages/modal/src/vue/composables/useWeb3AuthConnect.ts
@@ -1,4 +1,4 @@
-import { IProvider, LoginParamMap, WALLET_CONNECTOR_TYPE, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { IProvider, log, LoginParamMap, WALLET_CONNECTOR_TYPE, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref, watch } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -40,6 +40,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       connectorName.value = web3Auth.value.connectedConnectorName;
       return localProvider;
     } catch (err) {
+      log.error("Error connecting", err);
       error.value = err as Web3AuthError;
       return null;
     } finally {
@@ -56,6 +57,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       connectorName.value = web3Auth.value.connectedConnectorName;
       return localProvider;
     } catch (err) {
+      log.error("Error connecting to", err);
       error.value = err as Web3AuthError;
       return null;
     } finally {
diff --git a/packages/modal/src/vue/composables/useWeb3AuthDisconnect.ts b/packages/modal/src/vue/composables/useWeb3AuthDisconnect.ts
index 37d2be315..a875f451e 100644
--- a/packages/modal/src/vue/composables/useWeb3AuthDisconnect.ts
+++ b/packages/modal/src/vue/composables/useWeb3AuthDisconnect.ts
@@ -1,4 +1,4 @@
-import { WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -21,6 +21,7 @@ export const useWeb3AuthDisconnect = (): IUseWeb3AuthDisconnect => {
       loading.value = true;
       await web3Auth.value.logout(options);
     } catch (err) {
+      log.error("Error disconnecting", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/composables/useWeb3AuthUser.ts b/packages/modal/src/vue/composables/useWeb3AuthUser.ts
index 99685f37d..2caa181da 100644
--- a/packages/modal/src/vue/composables/useWeb3AuthUser.ts
+++ b/packages/modal/src/vue/composables/useWeb3AuthUser.ts
@@ -1,4 +1,4 @@
-import { type UserInfo, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, type UserInfo, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref, watch } from "vue";
 
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
@@ -26,6 +26,7 @@ export const useWeb3AuthUser = (): IUseWeb3AuthUser => {
       userInfo.value = result;
       return result;
     } catch (err) {
+      log.error("Error getting user info", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/interfaces.ts b/packages/modal/src/vue/interfaces.ts
index e14f2d51e..9c55a6407 100644
--- a/packages/modal/src/vue/interfaces.ts
+++ b/packages/modal/src/vue/interfaces.ts
@@ -13,6 +13,7 @@ export interface Web3AuthProviderProps {
 
 interface IBaseWeb3AuthComposableContext {
   isConnected: Ref<boolean>;
+  isAuthorized: Ref<boolean>;
   provider: Ref<IProvider | null>;
   isInitializing: Ref<boolean>;
   initError: Ref<Error | null>;
diff --git a/packages/modal/src/vue/solana/composables/useSignAndSendTransaction.ts b/packages/modal/src/vue/solana/composables/useSignAndSendTransaction.ts
index 335ef8ba9..282191338 100644
--- a/packages/modal/src/vue/solana/composables/useSignAndSendTransaction.ts
+++ b/packages/modal/src/vue/solana/composables/useSignAndSendTransaction.ts
@@ -1,4 +1,4 @@
-import { TransactionOrVersionedTransaction, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, TransactionOrVersionedTransaction, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -25,6 +25,7 @@ export const useSignAndSendTransaction = (): IUseSignAndSendTransaction => {
       data.value = signature;
       return signature;
     } catch (err) {
+      log.error("Error signing and sending transaction", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/solana/composables/useSignMessage.ts b/packages/modal/src/vue/solana/composables/useSignMessage.ts
index d2092ab62..e166a4885 100644
--- a/packages/modal/src/vue/solana/composables/useSignMessage.ts
+++ b/packages/modal/src/vue/solana/composables/useSignMessage.ts
@@ -1,4 +1,4 @@
-import { WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -24,6 +24,7 @@ export const useSignMessage = (): IUseSignMessage => {
       data.value = signature;
       return signature;
     } catch (err) {
+      log.error("Error signing message", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/modal/src/vue/solana/composables/useSignTransaction.ts b/packages/modal/src/vue/solana/composables/useSignTransaction.ts
index 68a681c25..aa4936927 100644
--- a/packages/modal/src/vue/solana/composables/useSignTransaction.ts
+++ b/packages/modal/src/vue/solana/composables/useSignTransaction.ts
@@ -1,4 +1,4 @@
-import { TransactionOrVersionedTransaction, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
+import { log, TransactionOrVersionedTransaction, WalletInitializationError, Web3AuthError } from "@web3auth/no-modal";
 import { Ref, ref } from "vue";
 
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -25,6 +25,7 @@ export const useSignTransaction = (): IUseSignTransaction => {
       data.value = signedTransaction;
       return signedTransaction;
     } catch (err) {
+      log.error("Error signing transaction", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/base/connector/baseConnector.ts b/packages/no-modal/src/base/connector/baseConnector.ts
index b6ff0b5e0..93220af55 100644
--- a/packages/no-modal/src/base/connector/baseConnector.ts
+++ b/packages/no-modal/src/base/connector/baseConnector.ts
@@ -3,6 +3,7 @@ import { SafeEventEmitter } from "@web3auth/auth";
 import { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES, ConnectorNamespaceType, CustomChainConfig } from "../chain/IChainInterface";
 import { WalletInitializationError, WalletLoginError } from "../errors";
 import { WALLET_CONNECTOR_TYPE, WALLET_CONNECTORS } from "../wallet";
+import { CAN_AUTHORIZE_STATUSES, CONNECTED_STATUSES } from "./connectorStatus";
 import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from "./constants";
 import type {
   BaseConnectorLoginParams,
@@ -41,8 +42,12 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
     this.coreOptions = options.coreOptions;
   }
 
-  get connnected(): boolean {
-    return this.status === CONNECTOR_STATUS.CONNECTED;
+  get connected(): boolean {
+    return CONNECTED_STATUSES.includes(this.status);
+  }
+
+  get canAuthorize(): boolean {
+    return CAN_AUTHORIZE_STATUSES.includes(this.status);
   }
 
   public abstract get provider(): IProvider | null;
@@ -53,7 +58,7 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
     if (this.name === WALLET_CONNECTORS.METAMASK && !this.isInjected && this.status === CONNECTOR_STATUS.CONNECTING) return;
 
     if (this.status === CONNECTOR_STATUS.CONNECTING) throw WalletInitializationError.notReady("Already connecting");
-    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.connectionError("Already connected");
+    if (this.connected) throw WalletLoginError.connectionError("Already connected");
     if (this.status !== CONNECTOR_STATUS.READY)
       throw WalletLoginError.connectionError(
         "Wallet connector is not ready yet, Please wait for init function to resolve before calling connect/connectTo function"
@@ -72,12 +77,12 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
     if (this.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN && this.connectorNamespace !== chainConfig.chainNamespace)
       throw WalletInitializationError.invalidParams("Connector doesn't support this chain namespace");
     if (this.status === CONNECTOR_STATUS.NOT_READY) return;
-    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletInitializationError.notReady("Already connected");
+    if (this.connected) throw WalletInitializationError.notReady("Already connected");
     if (this.status === CONNECTOR_STATUS.READY) throw WalletInitializationError.notReady("Connector is already initialized");
   }
 
   checkDisconnectionRequirements(): void {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.disconnectionError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.disconnectionError("Not connected with wallet");
   }
 
   checkSwitchChainRequirements(params: { chainId: string }, init = false): void {
diff --git a/packages/no-modal/src/base/connector/connectorStatus.ts b/packages/no-modal/src/base/connector/connectorStatus.ts
new file mode 100644
index 000000000..aa1356d62
--- /dev/null
+++ b/packages/no-modal/src/base/connector/connectorStatus.ts
@@ -0,0 +1,10 @@
+import { CONNECTOR_STATUS } from "./constants";
+import { CONNECTOR_STATUS_TYPE } from "./interfaces";
+
+export const CONNECTED_STATUSES: CONNECTOR_STATUS_TYPE[] = [CONNECTOR_STATUS.CONNECTED, CONNECTOR_STATUS.AUTHORIZED];
+
+export const CAN_AUTHORIZE_STATUSES: CONNECTOR_STATUS_TYPE[] = [
+  CONNECTOR_STATUS.AUTHORIZING,
+  CONNECTOR_STATUS.AUTHORIZED,
+  CONNECTOR_STATUS.CONNECTED,
+];
diff --git a/packages/no-modal/src/base/connector/constants.ts b/packages/no-modal/src/base/connector/constants.ts
index 7b41b50d3..209ef6cdd 100644
--- a/packages/no-modal/src/base/connector/constants.ts
+++ b/packages/no-modal/src/base/connector/constants.ts
@@ -6,6 +6,8 @@ export const CONNECTOR_STATUS = {
   DISCONNECTING: "disconnecting",
   DISCONNECTED: "disconnected",
   ERRORED: "errored",
+  AUTHORIZED: "authorized",
+  AUTHORIZING: "authorizing",
 } as const;
 
 export const CONNECTOR_EVENTS = {
@@ -21,3 +23,8 @@ export const CONNECTOR_CATEGORY = {
   EXTERNAL: "external",
   IN_APP: "in_app",
 } as const;
+
+export const CONNECTOR_INITIAL_AUTHENTICATION_MODE = {
+  CONNECT_ONLY: "connect-only",
+  CONNECT_AND_SIGN: "connect-and-sign",
+} as const;
diff --git a/packages/no-modal/src/base/connector/index.ts b/packages/no-modal/src/base/connector/index.ts
index 8ba65d9e1..4717c13cc 100644
--- a/packages/no-modal/src/base/connector/index.ts
+++ b/packages/no-modal/src/base/connector/index.ts
@@ -1,4 +1,5 @@
 export * from "./baseConnector";
+export * from "./connectorStatus";
 export * from "./constants";
 export * from "./interfaces";
 export * from "./utils";
diff --git a/packages/no-modal/src/base/connector/interfaces.ts b/packages/no-modal/src/base/connector/interfaces.ts
index d2ca30f65..9e3b81038 100644
--- a/packages/no-modal/src/base/connector/interfaces.ts
+++ b/packages/no-modal/src/base/connector/interfaces.ts
@@ -38,6 +38,10 @@ export interface ConnectorInitOptions {
    * The chainId to connect to
    */
   chainId: string;
+  /**
+   * Whether to get the identity token
+   */
+  getIdentityToken?: boolean;
 }
 
 export type CONNECTOR_STATUS_TYPE = (typeof CONNECTOR_STATUS)[keyof typeof CONNECTOR_STATUS];
@@ -73,7 +77,7 @@ export interface IConnector<T> extends SafeEventEmitter {
   status: CONNECTOR_STATUS_TYPE;
   provider: IProvider | null;
   connectorData?: unknown;
-  connnected: boolean;
+  connected: boolean;
   isInjected?: boolean;
   icon?: string;
   init(options?: ConnectorInitOptions): Promise<void>;
@@ -101,12 +105,17 @@ export type BaseConnectorLoginParams = {
 export type ConnectorFn = (params: ConnectorParams) => IConnector<unknown>;
 
 export type CONNECTED_EVENT_DATA = {
-  connector: WALLET_CONNECTOR_TYPE;
+  connector: WALLET_CONNECTOR_TYPE | string;
   provider: IProvider;
   reconnected: boolean;
   identityTokenInfo: IdentityTokenInfo;
 };
 
+export type AUTHORIZED_EVENT_DATA = {
+  connector: WALLET_CONNECTOR_TYPE | string;
+  identityTokenInfo: IdentityTokenInfo;
+};
+
 export interface IConnectorDataEvent {
   connectorName: string;
   data: unknown;
@@ -114,10 +123,12 @@ export interface IConnectorDataEvent {
 
 export type ConnectorEvents = {
   [CONNECTOR_EVENTS.NOT_READY]: () => void;
-  [CONNECTOR_EVENTS.READY]: (connector: string) => void;
+  [CONNECTOR_EVENTS.READY]: (connector: WALLET_CONNECTOR_TYPE | string) => void;
   [CONNECTOR_EVENTS.CONNECTED]: (data: CONNECTED_EVENT_DATA) => void;
   [CONNECTOR_EVENTS.DISCONNECTED]: () => void;
-  [CONNECTOR_EVENTS.CONNECTING]: (data: { connector: string }) => void;
+  [CONNECTOR_EVENTS.CONNECTING]: (data: { connector: WALLET_CONNECTOR_TYPE | string }) => void;
+  [CONNECTOR_EVENTS.AUTHORIZING]: (data: { connector: WALLET_CONNECTOR_TYPE | string }) => void;
+  [CONNECTOR_EVENTS.AUTHORIZED]: (data: AUTHORIZED_EVENT_DATA) => void;
   [CONNECTOR_EVENTS.ERRORED]: (error: Web3AuthError) => void;
   [CONNECTOR_EVENTS.REHYDRATION_ERROR]: (error: Web3AuthError) => void;
   [CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED]: (data: IConnectorDataEvent) => void;
diff --git a/packages/no-modal/src/base/core/IWeb3Auth.ts b/packages/no-modal/src/base/core/IWeb3Auth.ts
index a496fb2f1..8170603c5 100644
--- a/packages/no-modal/src/base/core/IWeb3Auth.ts
+++ b/packages/no-modal/src/base/core/IWeb3Auth.ts
@@ -14,6 +14,7 @@ import { type ChainNamespaceType, type CustomChainConfig } from "../chain/IChain
 import {
   CONNECTED_EVENT_DATA,
   CONNECTOR_EVENTS,
+  CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   type CONNECTOR_STATUS_TYPE,
   ConnectorEvents,
   type ConnectorFn,
@@ -62,6 +63,9 @@ export interface UIConfig extends WhiteLabelData {
   uxMode?: UX_MODE_TYPE;
 }
 
+export type ConnectorInitialAuthenticationModeType =
+  (typeof CONNECTOR_INITIAL_AUTHENTICATION_MODE)[keyof typeof CONNECTOR_INITIAL_AUTHENTICATION_MODE];
+
 export interface IWeb3AuthCoreOptions {
   /**
    * Client id for web3auth.
@@ -178,6 +182,12 @@ export interface IWeb3AuthCoreOptions {
    * MFA level for the auth connector
    */
   mfaLevel?: MfaLevelType;
+
+  /**
+   * Initial authentication mode for the auth connector.
+   * @defaultValue "connect-only"
+   */
+  initialAuthenticationMode?: ConnectorInitialAuthenticationModeType;
 }
 
 export type LoginParamMap = {
diff --git a/packages/no-modal/src/base/hooks/index.ts b/packages/no-modal/src/base/hooks/index.ts
index 930889d5a..631e621a8 100644
--- a/packages/no-modal/src/base/hooks/index.ts
+++ b/packages/no-modal/src/base/hooks/index.ts
@@ -9,6 +9,7 @@ export interface IBaseWeb3AuthHookContext {
   isInitializing: boolean;
   initError: unknown;
   isConnected: boolean;
+  isAuthorized: boolean;
   isMFAEnabled: boolean;
   provider: IProvider | null;
   status: CONNECTOR_STATUS_TYPE | null;
diff --git a/packages/no-modal/src/connectors/auth-connector/authConnector.ts b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
index 1b30c2d33..6816e1d72 100644
--- a/packages/no-modal/src/connectors/auth-connector/authConnector.ts
+++ b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
@@ -28,6 +28,7 @@ import {
   CHAIN_NAMESPACES,
   cloneDeep,
   CONNECTED_EVENT_DATA,
+  CONNECTED_STATUSES,
   CONNECTOR_CATEGORY,
   CONNECTOR_CATEGORY_TYPE,
   CONNECTOR_EVENTS,
@@ -187,7 +188,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
       // connect only if it is redirect result or if connect (connector is cached/already connected in same session) is true
       if (sessionId && (options.autoConnect || isRedirectResult)) {
         this.rehydrated = true;
-        await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
       } else if (!sessionId && options.autoConnect) {
         // if here, this means that the connector is cached but the sessionId is not available.
         // this can happen if the sessionId has expired.
@@ -221,7 +222,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   public async enableMFA(params: AuthLoginParams = { authConnection: "" }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
       const result = await this.authInstance.enableMFA(params);
@@ -237,7 +238,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   public async manageMFA(params: AuthLoginParams = { authConnection: "" }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
       await this.authInstance.manageMFA(params);
@@ -251,7 +252,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   async disconnect(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     this.status = CONNECTOR_STATUS.DISCONNECTING;
     await this.authInstance.logout();
@@ -271,13 +272,17 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   async getIdentityToken(): Promise<{ idToken: string }> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.AUTH });
     const userInfo = await this.getUserInfo();
+    this.status = CONNECTOR_STATUS.AUTHORIZED;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.AUTH, identityTokenInfo: { idToken: userInfo.idToken as string } });
     return { idToken: userInfo.idToken as string };
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     const userInfo = this.authInstance.getUserInfo();
     return userInfo;
@@ -400,9 +405,6 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
           // if getIdentityToken is true, then get the identity token
           // No need to get the identity token for auth connector as it is already handled
           let identityTokenInfo: IdentityTokenInfo | undefined;
-          if (params.getIdentityToken) {
-            identityTokenInfo = await this.getIdentityToken();
-          }
           this.status = CONNECTOR_STATUS.CONNECTED;
           this.emit(CONNECTOR_EVENTS.CONNECTED, {
             connector: WALLET_CONNECTORS.AUTH,
@@ -410,9 +412,13 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
             provider: this.provider,
             identityTokenInfo,
           } as CONNECTED_EVENT_DATA);
+
+          if (params.getIdentityToken) {
+            identityTokenInfo = await this.getIdentityToken();
+          }
           // handle disconnect from ws embed
           this.wsEmbedInstance?.provider.on("accountsChanged", (accounts: unknown[] = []) => {
-            if ((accounts as string[]).length === 0 && this.status === CONNECTOR_STATUS.CONNECTED) this.disconnect({ cleanup: false });
+            if ((accounts as string[]).length === 0 && CONNECTED_STATUSES.includes(this.status)) this.disconnect({ cleanup: false });
           });
         }
       }
diff --git a/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts b/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
index 490fefd5b..a900d0704 100644
--- a/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
+++ b/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
@@ -11,6 +11,7 @@ import {
   getSavedToken,
   IdentityTokenInfo,
   saveToken,
+  WALLET_CONNECTOR_TYPE,
   WalletInitializationError,
   WalletLoginError,
 } from "../../base";
@@ -19,15 +20,18 @@ export abstract class BaseEvmConnector<T> extends BaseConnector<T> {
   async init(_?: ConnectorInitOptions): Promise<void> {}
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with valid options");
-
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: this.name as WALLET_CONNECTOR_TYPE });
     const accounts = await this.provider.request<never, string[]>({ method: EVM_METHOD_TYPES.GET_ACCOUNTS });
     if (accounts && accounts.length > 0) {
       const existingToken = getSavedToken(accounts[0] as string, this.name);
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name as WALLET_CONNECTOR_TYPE, identityTokenInfo: { idToken: existingToken } });
           return { idToken: existingToken };
         }
       }
@@ -64,6 +68,8 @@ export abstract class BaseEvmConnector<T> extends BaseConnector<T> {
         this.coreOptions.web3AuthNetwork
       );
       saveToken(accounts[0] as string, this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name as WALLET_CONNECTOR_TYPE, identityTokenInfo: { idToken } });
       return { idToken };
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
diff --git a/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts b/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts
index c9bdb23a5..d9c7ade06 100644
--- a/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts
+++ b/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts
@@ -11,6 +11,7 @@ import {
   getSavedToken,
   IdentityTokenInfo,
   saveToken,
+  WALLET_CONNECTOR_TYPE,
   WalletInitializationError,
   WalletLoginError,
 } from "../../base";
@@ -19,15 +20,20 @@ export abstract class BaseSolanaConnector<T> extends BaseConnector<T> {
   async init(_?: ConnectorInitOptions): Promise<void> {}
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid options");
 
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: this.name as WALLET_CONNECTOR_TYPE });
+
     const accounts = await this.provider.request<never, string[]>({ method: SOLANA_METHOD_TYPES.GET_ACCOUNTS });
     if (accounts && accounts.length > 0) {
       const existingToken = getSavedToken(accounts[0] as string, this.name);
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name as WALLET_CONNECTOR_TYPE, identityTokenInfo: { idToken: existingToken } });
           return { idToken: existingToken };
         }
       }
@@ -62,6 +68,8 @@ export abstract class BaseSolanaConnector<T> extends BaseConnector<T> {
         this.coreOptions.web3AuthNetwork
       );
       saveToken(accounts[0] as string, this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: this.name as WALLET_CONNECTOR_TYPE, identityTokenInfo: { idToken } });
       return { idToken };
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
diff --git a/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts b/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts
index 0677b8245..b57ba6649 100644
--- a/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts
+++ b/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts
@@ -82,7 +82,7 @@ class CoinbaseConnector extends BaseEvmConnector<void> {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         // the connect function could fail silently as well.
         if (!provider) {
           this.rehydrated = false;
@@ -114,16 +114,20 @@ class CoinbaseConnector extends BaseEvmConnector<void> {
         // ready to be connected again
         this.disconnect();
       });
+
       let identityTokenInfo: IdentityTokenInfo | undefined;
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
+
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: WALLET_CONNECTORS.COINBASE,
         reconnected: this.rehydrated,
         provider: this.provider,
         identityTokenInfo,
       } as CONNECTED_EVENT_DATA);
+
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
+
       return this.provider;
     } catch (error) {
       // ready again to be connected
@@ -150,7 +154,7 @@ class CoinbaseConnector extends BaseEvmConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts b/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts
index 59dc3d5db..cf60e3e23 100644
--- a/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts
+++ b/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts
@@ -71,7 +71,7 @@ class InjectedEvmConnector extends BaseEvmConnector<void> {
       log.debug(`initializing ${this.name} injected connector`);
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         if (!provider) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");
@@ -110,15 +110,18 @@ class InjectedEvmConnector extends BaseEvmConnector<void> {
       };
       this.injectedProvider.on("accountsChanged", accountDisconnectHandler);
       let identityTokenInfo: IdentityTokenInfo | undefined;
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
+
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: this.name,
         reconnected: this.rehydrated,
         provider: this.injectedProvider,
         identityTokenInfo,
       } as CONNECTED_EVENT_DATA);
+
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
+
       return this.injectedProvider;
     } catch (error) {
       // ready again to be connected
@@ -150,7 +153,7 @@ class InjectedEvmConnector extends BaseEvmConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts b/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts
index e49d16748..d92364755 100644
--- a/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts
+++ b/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts
@@ -63,7 +63,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
   }
 
   get isWalletConnected(): boolean {
-    return !!(this.status === CONNECTOR_STATUS.CONNECTED && this.wallet.accounts.length > 0);
+    return !!(this.connected && this.wallet.accounts.length > 0);
   }
 
   async init(options: ConnectorInitOptions): Promise<void> {
@@ -81,7 +81,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
       log.debug("initializing solana injected connector");
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         if (!provider) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");
@@ -112,15 +112,18 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
 
       this.status = CONNECTOR_STATUS.CONNECTED;
       let identityTokenInfo: IdentityTokenInfo | undefined;
-      if (getIdentityToken) {
-        identityTokenInfo = await this.getIdentityToken();
-      }
+
       this.emit(CONNECTOR_EVENTS.CONNECTED, {
         connector: this.name,
         reconnected: this.rehydrated,
         provider: this.provider,
         identityTokenInfo,
       } as CONNECTED_EVENT_DATA);
+
+      if (getIdentityToken) {
+        identityTokenInfo = await this.getIdentityToken();
+      }
+
       return this.provider;
     } catch (error: unknown) {
       // ready again to be connected
@@ -148,7 +151,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (!this.isWalletConnected) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts b/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
index 566e7feb5..037ce6114 100644
--- a/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
+++ b/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
@@ -105,7 +105,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: false });
+        const provider = await this.connect({ chainId: options.chainId, getIdentityToken: options.getIdentityToken });
         if (!provider) {
           this.rehydrated = false;
           throw WalletLoginError.connectionError("Failed to rehydrate.");
@@ -179,6 +179,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
       }
 
       let identityTokenInfo: IdentityTokenInfo | undefined;
+
       if (getIdentityToken) {
         identityTokenInfo = await this.getIdentityToken();
       }
@@ -189,6 +190,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
         provider: this.metamaskProvider,
         identityTokenInfo,
       } as CONNECTED_EVENT_DATA);
+
       return this.metamaskProvider;
     } catch (error) {
       // ready again to be connected
@@ -228,7 +230,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts b/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts
index acecad57c..31b8cf0c2 100644
--- a/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts
+++ b/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts
@@ -140,7 +140,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
       if (this.connected) {
         this.rehydrated = true;
         try {
-          await this.onConnectHandler({ chain: chainConfig, getIdentityToken: false });
+          await this.onConnectHandler({ chain: chainConfig, getIdentityToken: options.getIdentityToken });
         } catch (error) {
           log.error("wallet auto connect", error);
           this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error as Web3AuthError);
@@ -196,7 +196,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
 
       // if already connected
       if (this.connected) {
-        await this.onConnectHandler({ chain: chainConfig, getIdentityToken: false });
+        await this.onConnectHandler({ chain: chainConfig, getIdentityToken });
         return this.provider;
       }
 
@@ -242,7 +242,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
@@ -267,7 +267,9 @@ class WalletConnectV2Connector extends BaseConnector<void> {
   }
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2 });
     const { chainId } = this.provider;
     const currentChainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
     if (!currentChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
@@ -281,6 +283,8 @@ class WalletConnectV2Connector extends BaseConnector<void> {
       if (existingToken) {
         const isExpired = checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
+          this.status = CONNECTOR_STATUS.AUTHORIZED;
+          this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2, identityTokenInfo: { idToken: existingToken } });
           return { idToken: existingToken };
         }
       }
@@ -308,6 +312,8 @@ class WalletConnectV2Connector extends BaseConnector<void> {
         this.coreOptions.web3AuthNetwork
       );
       saveToken(accounts[0] as string, this.name, idToken);
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2, identityTokenInfo: { idToken } });
       return { idToken };
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
@@ -439,16 +445,16 @@ class WalletConnectV2Connector extends BaseConnector<void> {
     if (trackCompletionEvents) trackCompletionEvents();
 
     let identityTokenInfo: IdentityTokenInfo | undefined;
-    if (getIdentityToken) {
-      identityTokenInfo = await this.getIdentityToken();
-    }
-
     this.emit(CONNECTOR_EVENTS.CONNECTED, {
       connector: WALLET_CONNECTORS.WALLET_CONNECT_V2,
       reconnected: this.rehydrated,
       provider: this.provider,
       identityTokenInfo,
     } as CONNECTED_EVENT_DATA);
+
+    if (getIdentityToken) {
+      identityTokenInfo = await this.getIdentityToken();
+    }
   }
 
   private subscribeEvents(): void {
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
index c1b5b8757..a2bda2723 100644
--- a/packages/no-modal/src/noModal.ts
+++ b/packages/no-modal/src/noModal.ts
@@ -10,10 +10,14 @@ import {
   ANALYTICS_INTEGRATION_TYPE,
   ANALYTICS_SDK_TYPE,
   AuthLoginParams,
+  AUTHORIZED_EVENT_DATA,
+  CAN_AUTHORIZE_STATUSES,
   CHAIN_NAMESPACES,
   type ChainNamespaceType,
   type CONNECTED_EVENT_DATA,
+  CONNECTED_STATUSES,
   CONNECTOR_EVENTS,
+  CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   CONNECTOR_NAMESPACES,
   CONNECTOR_STATUS,
   type CONNECTOR_STATUS_TYPE,
@@ -103,7 +107,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
     this.loadState(initialState);
     if (this.state.idToken && this.coreOptions.ssr) {
-      this.status = CONNECTOR_STATUS.CONNECTED;
+      // connect-only is the default authentication mode, so we need to set the status to connected if the idToken is present and ssr is enabled
+      this.status =
+        this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
+          ? CONNECTOR_STATUS.AUTHORIZED
+          : CONNECTOR_STATUS.CONNECTED;
     }
   }
 
@@ -143,6 +151,10 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     return this.aaProvider;
   }
 
+  get idToken(): string | null {
+    return this.state.idToken || null;
+  }
+
   set provider(_: IProvider | null) {
     throw new Error("Not implemented");
   }
@@ -275,7 +287,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     const newChainConfig = this.coreOptions.chains.find((x) => x.chainId === params.chainId);
     if (!newChainConfig) throw WalletInitializationError.invalidParams("Invalid chainId");
 
-    if (this.status === CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
+    if (CONNECTED_STATUSES.includes(this.status) && this.connectedConnector) {
       await this.connectedConnector.switchChain(params);
       return;
     }
@@ -302,7 +314,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       throw WalletInitializationError.notFound(`Please add wallet connector for ${connectorName} wallet, before connecting`);
 
     const initialChain = this.getInitialChainIdForConnector(connector);
-    const finalLoginParams = { ...loginParams, chainId: initialChain.chainId };
+    const finalLoginParams = {
+      ...loginParams,
+      chainId: initialChain.chainId,
+      getIdentityToken: this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+    };
 
     // track connection started event
     const startTime = Date.now();
@@ -348,21 +364,56 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     this.analytics.track(ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
 
     return new Promise((resolve, reject) => {
+      let connectedEventCompleted = false;
+      let authorizedEventReceived = false;
+
       const cleanup = () => {
         this.off(CONNECTOR_EVENTS.CONNECTED, onConnected);
         this.off(CONNECTOR_EVENTS.ERRORED, onErrored);
+        this.off(CONNECTOR_EVENTS.AUTHORIZED, onAuthorized);
+      };
+
+      const checkCompletion = async () => {
+        // In CONNECT_AND_SIGN mode, wait for both connected event and authorized event
+        if (finalLoginParams.getIdentityToken) {
+          if (connectedEventCompleted && authorizedEventReceived) {
+            await completeConnection();
+          }
+        } else {
+          // In CONNECT_ONLY mode, just wait for connected event
+          if (connectedEventCompleted) {
+            await completeConnection();
+          }
+        }
+      };
+
+      const completeConnection = async () => {
+        try {
+          // track connection completed event
+          const userInfo = await connector.getUserInfo();
+          this.analytics.track(ANALYTICS_EVENTS.CONNECTION_COMPLETED, {
+            ...eventData,
+            is_mfa_enabled: userInfo?.isMfaEnabled,
+            duration: Date.now() - startTime,
+          });
+          cleanup();
+          resolve(this.provider);
+        } catch (error) {
+          cleanup();
+          reject(error);
+        }
       };
+
       const onConnected = async () => {
-        // track connection completed event
-        const userInfo = await connector.getUserInfo();
-        this.analytics.track(ANALYTICS_EVENTS.CONNECTION_COMPLETED, {
-          ...eventData,
-          is_mfa_enabled: userInfo?.isMfaEnabled,
-          duration: Date.now() - startTime,
-        });
-        cleanup();
-        resolve(this.provider);
+        connectedEventCompleted = true;
+        await checkCompletion();
+      };
+
+      const onAuthorized = async () => {
+        authorizedEventReceived = true;
+        await checkCompletion();
       };
+
       const onErrored = async (err: Web3AuthError) => {
         // track connection failed event
         this.analytics.track(ANALYTICS_EVENTS.CONNECTION_FAILED, {
@@ -373,7 +424,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
         cleanup();
         reject(err);
       };
+
       this.once(CONNECTOR_EVENTS.CONNECTED, onConnected);
+      if (finalLoginParams.getIdentityToken) {
+        this.once(CONNECTOR_EVENTS.AUTHORIZED, onAuthorized);
+      }
       this.once(CONNECTOR_EVENTS.ERRORED, onErrored);
       connector.connect(finalLoginParams);
       this.setCurrentChain(initialChain.chainId);
@@ -381,18 +436,19 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async logout(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.connectedConnector.status === CONNECTOR_STATUS.DISCONNECTING) return;
     await this.connectedConnector.disconnect(options);
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
     log.debug("Getting user info", this.status, this.connectedConnector?.name);
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     return this.connectedConnector.getUserInfo();
   }
 
   async enableMFA<T>(loginParams?: T): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH)
       throw WalletLoginError.unsupportedOperation(`EnableMFA is not supported for this connector.`);
 
@@ -411,7 +467,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async manageMFA<T>(loginParams?: T): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH)
       throw WalletLoginError.unsupportedOperation(`ManageMFA is not supported for this connector.`);
 
@@ -430,7 +486,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
 
     const trackData = { connector: this.connectedConnector.name };
     try {
@@ -676,7 +732,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     try {
       const initialChain = this.getInitialChainIdForConnector(connector);
       const autoConnect = this.checkIfAutoConnect(connector);
-      await connector.init({ autoConnect, chainId: initialChain.chainId });
+      await connector.init({
+        autoConnect,
+        chainId: initialChain.chainId,
+        getIdentityToken: this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN,
+      });
     } catch (e) {
       log.error(e, connector.name);
     }
@@ -776,7 +836,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   protected subscribeToConnectorEvents(connector: IConnector<unknown>): void {
     connector.on(CONNECTOR_EVENTS.CONNECTED, async (data: CONNECTED_EVENT_DATA) => {
       if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
-      const { provider } = data;
+      const { provider, identityTokenInfo } = data;
+
+      if (identityTokenInfo) {
+        this.setState({ idToken: identityTokenInfo.idToken });
+      }
 
       // when ssr is enabled, we need to get the idToken from the connector.
       if (this.coreOptions.ssr) {
@@ -828,7 +892,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
       this.status = CONNECTOR_STATUS.CONNECTED;
       log.debug("connected", this.status, this.connectedConnectorName);
-      this.connectToPlugins(data);
+      this.connectToPlugins({ ...data, connector: data.connector as WALLET_CONNECTOR_TYPE });
       this.emit(CONNECTOR_EVENTS.CONNECTED, { ...data, loginMode: this.loginMode });
     });
 
@@ -903,6 +967,18 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       });
       this.emit(CONNECTOR_EVENTS.MFA_ENABLED, isMFAEnabled);
     });
+
+    connector.on(CONNECTOR_EVENTS.AUTHORIZING, (data) => {
+      this.status = CONNECTOR_STATUS.AUTHORIZING;
+      this.emit(CONNECTOR_EVENTS.AUTHORIZING, data);
+      log.debug("authorizing", this.status, this.connectedConnectorName);
+    });
+    connector.on(CONNECTOR_EVENTS.AUTHORIZED, (data: AUTHORIZED_EVENT_DATA) => {
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
+      this.setState({ idToken: data.identityTokenInfo.idToken });
+      this.emit(CONNECTOR_EVENTS.AUTHORIZED, data);
+      log.debug("authorized", this.status, this.connectedConnectorName);
+    });
   }
 
   protected checkInitRequirements(): void {
diff --git a/packages/no-modal/src/plugins/nft-checkout-plugin/plugin.ts b/packages/no-modal/src/plugins/nft-checkout-plugin/plugin.ts
index b68f28a3f..66c0cd6d2 100644
--- a/packages/no-modal/src/plugins/nft-checkout-plugin/plugin.ts
+++ b/packages/no-modal/src/plugins/nft-checkout-plugin/plugin.ts
@@ -1,7 +1,7 @@
 import { SafeEventEmitter, type WhiteLabelData } from "@web3auth/auth";
 
 import {
-  CONNECTOR_STATUS,
+  CONNECTED_STATUSES,
   EVM_PLUGINS,
   IPlugin,
   IWeb3AuthCore,
@@ -62,7 +62,7 @@ class NFTCheckoutPlugin extends SafeEventEmitter implements IPlugin {
     this.emit(PLUGIN_EVENTS.CONNECTING);
     this.status = PLUGIN_STATUS.CONNECTING;
 
-    if (this.web3auth.status !== CONNECTOR_STATUS.CONNECTED) throw NFTCheckoutPluginError.web3AuthNotConnected();
+    if (!CONNECTED_STATUSES.includes(this.web3auth.status)) throw NFTCheckoutPluginError.web3AuthNotConnected();
     if (!this.web3auth.provider) throw NFTCheckoutPluginError.providerRequired();
 
     const accounts = await this.web3auth.provider.request<never, string[]>({
diff --git a/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts b/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
index f367b9735..f5a6fe44d 100644
--- a/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
+++ b/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
@@ -5,9 +5,9 @@ import WsEmbed from "@web3auth/ws-embed";
 import {
   type Analytics,
   ANALYTICS_EVENTS,
+  CAN_AUTHORIZE_STATUSES,
   CHAIN_NAMESPACES,
   ChainNamespaceType,
-  CONNECTOR_STATUS,
   EVM_PLUGINS,
   IPlugin,
   IProvider,
@@ -27,7 +27,6 @@ import { type AuthConnectorType } from "../../connectors/auth-connector";
 
 export { BUTTON_POSITION, type BUTTON_POSITION_TYPE, CONFIRMATION_STRATEGY, type CONFIRMATION_STRATEGY_TYPE } from "@web3auth/ws-embed";
 
-// TODO: support project config items here. incl. key export flag, multiple chains
 class WalletServicesPlugin extends SafeEventEmitter implements IPlugin {
   name = EVM_PLUGINS.WALLET_SERVICES;
 
@@ -92,7 +91,7 @@ class WalletServicesPlugin extends SafeEventEmitter implements IPlugin {
       }
     }
 
-    if (this.web3auth.status !== CONNECTOR_STATUS.CONNECTED) {
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.web3auth.status)) {
       throw WalletServicesPluginError.web3AuthNotConnected();
     } else if (!this.web3auth.provider) {
       throw WalletServicesPluginError.providerRequired();
@@ -137,8 +136,6 @@ class WalletServicesPlugin extends SafeEventEmitter implements IPlugin {
     this.analytics?.track(ANALYTICS_EVENTS.WALLET_CHECKOUT_CLICKED, {
       is_visible: showCheckoutParams?.show,
       receive_wallet_address_enabled: !!showCheckoutParams?.receiveWalletAddress,
-      // TODO: where is the below?
-      // receive_wallet_address: showCheckoutParams?.receiveWalletAddress,
       token_list: showCheckoutParams?.tokenList,
       fiat_list: showCheckoutParams?.fiatList,
       crypto: showCheckoutParams?.crypto,
diff --git a/packages/no-modal/src/react/context/Web3AuthInnerContext.ts b/packages/no-modal/src/react/context/Web3AuthInnerContext.ts
index 89c960773..8413fe2a8 100644
--- a/packages/no-modal/src/react/context/Web3AuthInnerContext.ts
+++ b/packages/no-modal/src/react/context/Web3AuthInnerContext.ts
@@ -34,6 +34,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
   const [isInitialized, setIsInitialized] = useState<boolean>(false);
   const [status, setStatus] = useState<CONNECTOR_STATUS_TYPE | null>(null);
   const [isMFAEnabled, setIsMFAEnabled] = useState<boolean>(false);
+  const [isAuthorized, setIsAuthorized] = useState<boolean>(false);
 
   const getPlugin = useCallback(
     (name: string) => {
@@ -78,7 +79,9 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     if (provider) {
       provider.on("chainChanged", handleChainChange);
       return () => {
-        provider.off("chainChanged", handleChainChange);
+        if (provider) {
+          provider.off("chainChanged", handleChainChange);
+        }
       };
     }
   }, [web3Auth, provider]);
@@ -101,6 +104,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     const disconnectedListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setIsAuthorized(false);
       setProvider(null);
     };
 
@@ -113,19 +117,30 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     const rehydrationErrorListener = () => {
       setStatus(web3Auth.status);
       setIsConnected(false);
+      setIsAuthorized(false);
       setProvider(null);
     };
 
+    const authorizedListener = () => {
+      setStatus(web3Auth.status);
+      if (web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
+        setIsConnected(true);
+        setIsAuthorized(true);
+      }
+    };
+
     const mfaEnabledListener = (isMFAEnabled: boolean) => {
       if (typeof isMFAEnabled === "boolean") setIsMFAEnabled(isMFAEnabled);
     };
 
+    // TODO: In strict mode, web3auth becomes null and .off throws an error sometimes.
     if (web3Auth) {
       // web3Auth is initialized here.
       setStatus(web3Auth.status);
       web3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
       web3Auth.on(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.on(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
       web3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
       web3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
       web3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -143,6 +158,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
         web3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
         web3Auth.off(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
         web3Auth.off(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+        web3Auth.off(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
       }
     };
   }, [web3Auth]);
@@ -161,6 +177,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
       chainNamespace,
       getPlugin,
       setIsMFAEnabled,
+      isAuthorized,
     };
   }, [
     web3Auth,
@@ -175,6 +192,7 @@ export function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProvider
     setIsMFAEnabled,
     chainId,
     chainNamespace,
+    isAuthorized,
   ]);
 
   return createElement(Web3AuthInnerContext.Provider, { value }, children);
diff --git a/packages/no-modal/src/react/hooks/useIdentityToken.ts b/packages/no-modal/src/react/hooks/useIdentityToken.ts
index de3acef11..d19137342 100644
--- a/packages/no-modal/src/react/hooks/useIdentityToken.ts
+++ b/packages/no-modal/src/react/hooks/useIdentityToken.ts
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = () => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isConnected, isAuthorized } = useWeb3AuthInner();
 
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<Web3AuthError | null>(null);
@@ -34,10 +34,14 @@ export const useIdentityToken = () => {
   }, [web3Auth]);
 
   useEffect(() => {
-    if (!isConnected && token) {
+    if (!web3Auth) return;
+    if (!isAuthorized && token) {
       setToken(null);
     }
-  }, [isConnected, token]);
+    if (isAuthorized && !token) {
+      setToken(web3Auth.idToken);
+    }
+  }, [isConnected, isAuthorized, token]);
 
   return { loading, error, token, getIdentityToken };
 };
diff --git a/packages/no-modal/src/react/hooks/useWeb3Auth.ts b/packages/no-modal/src/react/hooks/useWeb3Auth.ts
index b6fe378c0..15729ec2b 100644
--- a/packages/no-modal/src/react/hooks/useWeb3Auth.ts
+++ b/packages/no-modal/src/react/hooks/useWeb3Auth.ts
@@ -4,7 +4,7 @@ import { useWeb3AuthInner } from "./useWeb3AuthInner";
 export type IUseWeb3Auth = Omit<IWeb3AuthInnerContext, "isMFAEnabled" | "setIsMFAEnabled" | "chainId" | "chainNamespace">;
 
 export const useWeb3Auth = (): IUseWeb3Auth => {
-  const { initError, isConnected, isInitialized, isInitializing, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
+  const { initError, isConnected, isAuthorized, isInitialized, isInitializing, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
   return {
     initError,
     isConnected,
@@ -13,6 +13,7 @@ export const useWeb3Auth = (): IUseWeb3Auth => {
     provider,
     status,
     web3Auth,
+    isAuthorized,
     getPlugin,
   };
 };
diff --git a/packages/no-modal/src/vue/WalletServicesInnerProvider.ts b/packages/no-modal/src/vue/WalletServicesInnerProvider.ts
index bfee2b526..4b4a81a6b 100644
--- a/packages/no-modal/src/vue/WalletServicesInnerProvider.ts
+++ b/packages/no-modal/src/vue/WalletServicesInnerProvider.ts
@@ -28,7 +28,7 @@ export const WalletServicesInnerProvider = defineComponent({
     watch(isConnected, (newIsConnected) => {
       if (newIsConnected) {
         const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES) as WalletServicesPluginType;
-        if (!walletServicesPlugin.value) walletServicesPlugin.value = plugin;
+        walletServicesPlugin.value = plugin;
         // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
         if (walletServicesPlugin.value?.status === CONNECTOR_STATUS.CONNECTED) ready.value = true;
       }
diff --git a/packages/no-modal/src/vue/Web3AuthProvider.ts b/packages/no-modal/src/vue/Web3AuthProvider.ts
index 30b50bcfd..cad4e144d 100644
--- a/packages/no-modal/src/vue/Web3AuthProvider.ts
+++ b/packages/no-modal/src/vue/Web3AuthProvider.ts
@@ -6,6 +6,7 @@ import {
   CONNECTOR_STATUS,
   type CONNECTOR_STATUS_TYPE,
   type IProvider,
+  log,
   WalletInitializationError,
   Web3AuthContextKey,
 } from "../base";
@@ -27,6 +28,7 @@ export const Web3AuthProvider = defineComponent({
     const isInitialized = ref(false);
 
     const isConnected = ref(false);
+    const isAuthorized = ref(false);
 
     const getPlugin = (name: string) => {
       if (!web3Auth.value) throw WalletInitializationError.notReady();
@@ -44,6 +46,7 @@ export const Web3AuthProvider = defineComponent({
           provider.value = null;
           isMFAEnabled.value = false;
           isConnected.value = false;
+          isAuthorized.value = false;
           status.value = null;
         };
 
@@ -80,6 +83,7 @@ export const Web3AuthProvider = defineComponent({
             isInitializing.value = true;
             await newWeb3Auth.init({ signal: controller.signal });
           } catch (error) {
+            log.error("Error initializing web3auth", error);
             initError.value = error as Error;
           } finally {
             isInitializing.value = false;
@@ -110,11 +114,20 @@ export const Web3AuthProvider = defineComponent({
           }
         };
 
+        const authorizedListener = () => {
+          status.value = web3Auth.value!.status;
+          if (web3Auth.value!.status === CONNECTOR_STATUS.AUTHORIZED) {
+            isAuthorized.value = true;
+            isConnected.value = true;
+          }
+        };
+
         const disconnectedListener = () => {
           status.value = web3Auth.value!.status;
           isConnected.value = false;
           provider.value = null;
           isMFAEnabled.value = false;
+          isAuthorized.value = false;
         };
 
         const connectingListener = () => {
@@ -134,6 +147,7 @@ export const Web3AuthProvider = defineComponent({
           prevWeb3Auth.off(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.READY, readyListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+          prevWeb3Auth.off(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.CONNECTING, connectingListener);
           prevWeb3Auth.off(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -147,6 +161,7 @@ export const Web3AuthProvider = defineComponent({
           newWeb3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTED, connectedListener);
+          newWeb3Auth.on(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTING, connectingListener);
           newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
@@ -168,6 +183,7 @@ export const Web3AuthProvider = defineComponent({
       isMFAEnabled,
       getPlugin,
       setIsMFAEnabled,
+      isAuthorized,
     });
   },
   render() {
diff --git a/packages/no-modal/src/vue/composables/useCheckout.ts b/packages/no-modal/src/vue/composables/useCheckout.ts
index fbe2c1f29..07376630d 100644
--- a/packages/no-modal/src/vue/composables/useCheckout.ts
+++ b/packages/no-modal/src/vue/composables/useCheckout.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseCheckout {
@@ -24,6 +24,7 @@ export const useCheckout = (): IUseCheckout => {
 
       await plugin.value.showCheckout(showCheckoutParams);
     } catch (err) {
+      log.error("Error showing checkout", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useEnableMFA.ts b/packages/no-modal/src/vue/composables/useEnableMFA.ts
index e554e7812..c83d7f864 100644
--- a/packages/no-modal/src/vue/composables/useEnableMFA.ts
+++ b/packages/no-modal/src/vue/composables/useEnableMFA.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseEnableMFA {
@@ -21,6 +21,7 @@ export const useEnableMFA = (): IUseEnableMFA => {
       loading.value = true;
       await web3Auth.value.enableMFA();
     } catch (err) {
+      log.error("Error enabling MFA", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useFunding.ts b/packages/no-modal/src/vue/composables/useFunding.ts
index b8f7c445d..168bb0d5e 100644
--- a/packages/no-modal/src/vue/composables/useFunding.ts
+++ b/packages/no-modal/src/vue/composables/useFunding.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseFunding {
@@ -24,6 +24,7 @@ export const useFunding = (): IUseFunding => {
 
       await plugin.value.showFunding(showFundingParams);
     } catch (err) {
+      log.error("Error showing funding", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useIdentityToken.ts b/packages/no-modal/src/vue/composables/useIdentityToken.ts
index d357e17db..5595fb622 100644
--- a/packages/no-modal/src/vue/composables/useIdentityToken.ts
+++ b/packages/no-modal/src/vue/composables/useIdentityToken.ts
@@ -1,6 +1,6 @@
 import { Ref, ref, watch } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseIdentityToken {
@@ -11,7 +11,7 @@ export interface IUseIdentityToken {
 }
 
 export const useIdentityToken = (): IUseIdentityToken => {
-  const { web3Auth, isConnected } = useWeb3AuthInner();
+  const { web3Auth, isAuthorized } = useWeb3AuthInner();
   const loading = ref(false);
   const error = ref<Web3AuthError | null>(null);
   const token = ref<string | null>(null);
@@ -27,17 +27,26 @@ export const useIdentityToken = (): IUseIdentityToken => {
       }
       return result?.idToken;
     } catch (err) {
+      log.error("Error getting identity token", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
     }
   };
 
-  watch(isConnected, (newIsConnected) => {
-    if (!newIsConnected && token.value) {
-      token.value = null;
-    }
-  });
+  watch(
+    isAuthorized,
+    (newIsAuthorized) => {
+      if (!web3Auth.value) return;
+      if (!newIsAuthorized && token.value) {
+        token.value = null;
+      }
+      if (newIsAuthorized && !token.value) {
+        token.value = web3Auth.value.idToken;
+      }
+    },
+    { immediate: true }
+  );
 
   return {
     loading,
diff --git a/packages/no-modal/src/vue/composables/useManageMFA.ts b/packages/no-modal/src/vue/composables/useManageMFA.ts
index 94fc038dc..29a588924 100644
--- a/packages/no-modal/src/vue/composables/useManageMFA.ts
+++ b/packages/no-modal/src/vue/composables/useManageMFA.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseManageMFA {
@@ -21,6 +21,7 @@ export const useManageMFA = (): IUseManageMFA => {
       loading.value = true;
       await web3Auth.value.manageMFA();
     } catch (err) {
+      log.error("Error managing MFA", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useReceive.ts b/packages/no-modal/src/vue/composables/useReceive.ts
index 601cc7fd0..df46cc8e0 100644
--- a/packages/no-modal/src/vue/composables/useReceive.ts
+++ b/packages/no-modal/src/vue/composables/useReceive.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseReceive {
@@ -24,6 +24,7 @@ export const useReceive = (): IUseReceive => {
 
       await plugin.value.showReceive(showReceiveParams);
     } catch (err) {
+      log.error("Error showing receive", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useSwap.ts b/packages/no-modal/src/vue/composables/useSwap.ts
index b2db55048..37aee38af 100644
--- a/packages/no-modal/src/vue/composables/useSwap.ts
+++ b/packages/no-modal/src/vue/composables/useSwap.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseSwap {
@@ -24,6 +24,7 @@ export const useSwap = (): IUseSwap => {
 
       await plugin.value.showSwap(showSwapParams);
     } catch (err) {
+      log.error("Error showing swap", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useSwitchChain.ts b/packages/no-modal/src/vue/composables/useSwitchChain.ts
index 642d2af60..f8db709ce 100644
--- a/packages/no-modal/src/vue/composables/useSwitchChain.ts
+++ b/packages/no-modal/src/vue/composables/useSwitchChain.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseSwitchChain {
@@ -21,6 +21,7 @@ export const useSwitchChain = (): IUseSwitchChain => {
       loading.value = true;
       await web3Auth.value.switchChain(chainParams);
     } catch (err) {
+      log.error("Error switching chain", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWalletConnectScanner.ts b/packages/no-modal/src/vue/composables/useWalletConnectScanner.ts
index fa1584a9f..7a23215fa 100644
--- a/packages/no-modal/src/vue/composables/useWalletConnectScanner.ts
+++ b/packages/no-modal/src/vue/composables/useWalletConnectScanner.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseWalletConnectScanner {
@@ -24,6 +24,7 @@ export const useWalletConnectScanner = (): IUseWalletConnectScanner => {
 
       await plugin.value.showWalletConnectScanner(showWalletConnectScannerParams);
     } catch (err) {
+      log.error("Error showing wallet connect scanner", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWalletUI.ts b/packages/no-modal/src/vue/composables/useWalletUI.ts
index f1c546ffa..f14c0e878 100644
--- a/packages/no-modal/src/vue/composables/useWalletUI.ts
+++ b/packages/no-modal/src/vue/composables/useWalletUI.ts
@@ -1,7 +1,7 @@
 import { BaseEmbedControllerState } from "@toruslabs/base-controllers";
 import { Ref, ref } from "vue";
 
-import { WalletServicesPluginError, Web3AuthError } from "../../base";
+import { log, WalletServicesPluginError, Web3AuthError } from "../../base";
 import { useWalletServicesPlugin } from "./useWalletServicesPlugin";
 
 export interface IUseWalletUI {
@@ -24,6 +24,7 @@ export const useWalletUI = (): IUseWalletUI => {
 
       await plugin.value.showWalletUi(showWalletUiParams);
     } catch (err) {
+      log.error("Error showing wallet UI", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWeb3Auth.ts b/packages/no-modal/src/vue/composables/useWeb3Auth.ts
index 93ed69746..84c78e482 100644
--- a/packages/no-modal/src/vue/composables/useWeb3Auth.ts
+++ b/packages/no-modal/src/vue/composables/useWeb3Auth.ts
@@ -4,12 +4,13 @@ import { useWeb3AuthInner } from "./useWeb3AuthInner";
 export type IWeb3AuthNoModalContext = Omit<IWeb3AuthInnerContext, "isMFAEnabled" | "setIsMFAEnabled">;
 
 export const useWeb3Auth = (): IWeb3AuthNoModalContext => {
-  const { initError, isConnected, isInitialized, isInitializing, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
+  const { initError, isConnected, isInitialized, isInitializing, isAuthorized, provider, status, web3Auth, getPlugin } = useWeb3AuthInner();
   return {
     initError,
     isConnected,
     isInitialized,
     isInitializing,
+    isAuthorized,
     provider,
     status,
     web3Auth,
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts b/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
index 482c14aec..be2322db1 100644
--- a/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
+++ b/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
@@ -1,6 +1,6 @@
 import { Ref, ref, watch } from "vue";
 
-import { IProvider, LoginParamMap, WALLET_CONNECTOR_TYPE, WalletInitializationError, Web3AuthError } from "../../base";
+import { IProvider, log, LoginParamMap, WALLET_CONNECTOR_TYPE, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseWeb3AuthConnect {
@@ -39,6 +39,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       connectorName.value = web3Auth.value.connectedConnectorName;
       return localProvider;
     } catch (err) {
+      log.error("Error connecting", err);
       error.value = err as Web3AuthError;
       return null;
     } finally {
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthDisconnect.ts b/packages/no-modal/src/vue/composables/useWeb3AuthDisconnect.ts
index dcf4c2c8a..38b52ab39 100644
--- a/packages/no-modal/src/vue/composables/useWeb3AuthDisconnect.ts
+++ b/packages/no-modal/src/vue/composables/useWeb3AuthDisconnect.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, Web3AuthError } from "../../base";
+import { log, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseWeb3AuthDisconnect {
@@ -21,6 +21,7 @@ export const useWeb3AuthDisconnect = (): IUseWeb3AuthDisconnect => {
       loading.value = true;
       await web3Auth.value.logout(options);
     } catch (err) {
+      log.error("Error disconnecting", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthUser.ts b/packages/no-modal/src/vue/composables/useWeb3AuthUser.ts
index 3e801dc97..794556a43 100644
--- a/packages/no-modal/src/vue/composables/useWeb3AuthUser.ts
+++ b/packages/no-modal/src/vue/composables/useWeb3AuthUser.ts
@@ -1,6 +1,6 @@
 import { Ref, ref, watch } from "vue";
 
-import { type UserInfo, WalletInitializationError, Web3AuthError } from "../../base";
+import { log, type UserInfo, WalletInitializationError, Web3AuthError } from "../../base";
 import { useWeb3AuthInner } from "./useWeb3AuthInner";
 
 export interface IUseWeb3AuthUser {
@@ -26,6 +26,7 @@ export const useWeb3AuthUser = (): IUseWeb3AuthUser => {
       userInfo.value = result;
       return result;
     } catch (err) {
+      log.error("Error getting user info", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/interfaces.ts b/packages/no-modal/src/vue/interfaces.ts
index f3baa9e6e..3bd67dcd3 100644
--- a/packages/no-modal/src/vue/interfaces.ts
+++ b/packages/no-modal/src/vue/interfaces.ts
@@ -14,6 +14,7 @@ export interface Web3AuthProviderProps {
 
 interface IBaseWeb3AuthComposableContext {
   isConnected: Ref<boolean>;
+  isAuthorized: Ref<boolean>;
   provider: Ref<IProvider | null>;
   isInitializing: Ref<boolean>;
   initError: Ref<Error | null>;
diff --git a/packages/no-modal/src/vue/solana/composables/useSignAndSendTransaction.ts b/packages/no-modal/src/vue/solana/composables/useSignAndSendTransaction.ts
index dbf9ba9b4..244740f49 100644
--- a/packages/no-modal/src/vue/solana/composables/useSignAndSendTransaction.ts
+++ b/packages/no-modal/src/vue/solana/composables/useSignAndSendTransaction.ts
@@ -1,5 +1,6 @@
 import { Ref, ref } from "vue";
 
+import { log } from "../../../base";
 import { WalletInitializationError, type Web3AuthError } from "../../../base/errors";
 import type { TransactionOrVersionedTransaction } from "../../../providers/solana-provider";
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -26,6 +27,7 @@ export const useSignAndSendTransaction = (): IUseSignAndSendTransaction => {
       data.value = signature;
       return signature;
     } catch (err) {
+      log.error("Error signing and sending transaction", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/solana/composables/useSignMessage.ts b/packages/no-modal/src/vue/solana/composables/useSignMessage.ts
index de873647b..7502b8462 100644
--- a/packages/no-modal/src/vue/solana/composables/useSignMessage.ts
+++ b/packages/no-modal/src/vue/solana/composables/useSignMessage.ts
@@ -1,6 +1,6 @@
 import { Ref, ref } from "vue";
 
-import { WalletInitializationError, type Web3AuthError } from "../../../base/errors";
+import { log, WalletInitializationError, type Web3AuthError } from "../../../base";
 import { useSolanaWallet } from "./useSolanaWallet";
 
 export type IUseSignMessage = {
@@ -25,6 +25,7 @@ export const useSignMessage = (): IUseSignMessage => {
       data.value = signature;
       return signature;
     } catch (err) {
+      log.error("Error signing message", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;
diff --git a/packages/no-modal/src/vue/solana/composables/useSignTransaction.ts b/packages/no-modal/src/vue/solana/composables/useSignTransaction.ts
index 6f3e15d5c..ead10453b 100644
--- a/packages/no-modal/src/vue/solana/composables/useSignTransaction.ts
+++ b/packages/no-modal/src/vue/solana/composables/useSignTransaction.ts
@@ -1,5 +1,6 @@
 import { Ref, ref } from "vue";
 
+import { log } from "../../../base";
 import { WalletInitializationError, type Web3AuthError } from "../../../base/errors";
 import { TransactionOrVersionedTransaction } from "../../../providers/solana-provider";
 import { useSolanaWallet } from "./useSolanaWallet";
@@ -26,6 +27,7 @@ export const useSignTransaction = (): IUseSignTransaction => {
       data.value = signedTransaction;
       return signedTransaction;
     } catch (err) {
+      log.error("Error signing transaction", err);
       error.value = err as Web3AuthError;
     } finally {
       loading.value = false;