diff --git a/demo/vue-app-new/package-lock.json b/demo/vue-app-new/package-lock.json
index 9e98a071d..6f020b94c 100644
--- a/demo/vue-app-new/package-lock.json
+++ b/demo/vue-app-new/package-lock.json
@@ -137,9 +137,9 @@
       "version": "11.0.0-beta.0",
       "license": "ISC",
       "dependencies": {
-        "@metamask/connect-evm": "^1.0.0",
-        "@metamask/connect-multichain": "^0.12.1",
-        "@metamask/connect-solana": "^1.0.0",
+        "@metamask/connect-evm": "^1.1.0",
+        "@metamask/connect-multichain": "^0.13.0",
+        "@metamask/connect-solana": "^1.1.0",
         "@segment/analytics-next": "^1.83.0",
         "@solana/client": "^1.7.0",
         "@solana/kit": "^6.8.0",
@@ -261,7 +261,6 @@
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
       "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -1655,6 +1654,29 @@
         "node": "^20.19.0 || >=22.12.0"
       }
     },
+    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.2.tgz",
+      "integrity": "sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.2.1",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz",
+      "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
@@ -2171,7 +2193,6 @@
       "resolved": "https://registry.npmjs.org/@solana/kit/-/kit-6.8.0.tgz",
       "integrity": "sha512-+McC1aCgcUBdM7Cd7U6k2ZHJ9OKCy5mzpb0XWrhkrgsFxT0QoRr0AcWJc85o6tIDfG6Jz7vVhbS3l8ugYz2Vzw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@solana/accounts": "6.8.0",
         "@solana/addresses": "6.8.0",
@@ -3140,7 +3161,6 @@
       "resolved": "https://registry.npmjs.org/@tanstack/vue-query/-/vue-query-5.100.6.tgz",
       "integrity": "sha512-aUvBla5roKKI311C4KHg+n0dHe+s9MKXwhUcro6Ajvu0L6IERoZ+/CjRqUCUgd5Y51ytuZAJl85uahgp7ViVlg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@tanstack/match-sorter-utils": "^8.19.4",
         "@tanstack/query-core": "5.100.6",
@@ -3398,7 +3418,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@adraffy/ens-normalize": "^1.11.0",
         "@noble/ciphers": "^1.3.0",
@@ -3615,6 +3634,7 @@
       "resolved": "https://registry.npmjs.org/@solana/accounts/-/accounts-5.5.1.tgz",
       "integrity": "sha512-TfOY9xixg5rizABuLVuZ9XI2x2tmWUC/OoN556xwfDlhBHBjKfszicYYOyD6nbFmwTGYarCmyGIdteXxTXIdhQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/addresses": "5.5.1",
         "@solana/codecs-core": "5.5.1",
@@ -3640,6 +3660,7 @@
       "resolved": "https://registry.npmjs.org/@solana/addresses/-/addresses-5.5.1.tgz",
       "integrity": "sha512-5xoah3Q9G30HQghu/9BiHLb5pzlPKRC3zydQDmE3O9H//WfayxTFppsUDCL6FjYUHqj/wzK6CWHySglc2RkpdA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/assertions": "5.5.1",
         "@solana/codecs-core": "5.5.1",
@@ -3664,6 +3685,7 @@
       "resolved": "https://registry.npmjs.org/@solana/assertions/-/assertions-5.5.1.tgz",
       "integrity": "sha512-YTCSWAlGwSlVPnWtWLm3ukz81wH4j2YaCveK+TjpvUU88hTy6fmUqxi0+hvAMAe4zKXpJyj3Az7BrLJRxbIm4Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/errors": "5.5.1"
       },
@@ -3684,6 +3706,7 @@
       "resolved": "https://registry.npmjs.org/@solana/codecs/-/codecs-5.5.1.tgz",
       "integrity": "sha512-Vea29nJub/bXjfzEV7ZZQ/PWr1pYLZo3z0qW0LQL37uKKVzVFRQlwetd7INk3YtTD3xm9WUYr7bCvYUk3uKy2g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/codecs-core": "5.5.1",
         "@solana/codecs-data-structures": "5.5.1",
@@ -3708,6 +3731,7 @@
       "resolved": "https://registry.npmjs.org/@solana/codecs-core/-/codecs-core-5.5.1.tgz",
       "integrity": "sha512-TgBt//bbKBct0t6/MpA8ElaOA3sa8eYVvR7LGslCZ84WiAwwjCY0lW/lOYsFHJQzwREMdUyuEyy5YWBKtdh8Rw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/errors": "5.5.1"
       },
@@ -3728,6 +3752,7 @@
       "resolved": "https://registry.npmjs.org/@solana/codecs-data-structures/-/codecs-data-structures-5.5.1.tgz",
       "integrity": "sha512-97bJWGyUY9WvBz3mX1UV3YPWGDTez6btCfD0ip3UVEXJbItVuUiOkzcO5iFDUtQT5riKT6xC+Mzl+0nO76gd0w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/codecs-core": "5.5.1",
         "@solana/codecs-numbers": "5.5.1",
@@ -3750,6 +3775,7 @@
       "resolved": "https://registry.npmjs.org/@solana/codecs-numbers/-/codecs-numbers-5.5.1.tgz",
       "integrity": "sha512-rllMIZAHqmtvC0HO/dc/21wDuWaD0B8Ryv8o+YtsICQBuiL/0U4AGwH7Pi5GNFySYk0/crSuwfIqQFtmxNSPFw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/codecs-core": "5.5.1",
         "@solana/errors": "5.5.1"
@@ -3771,6 +3797,7 @@
       "resolved": "https://registry.npmjs.org/@solana/codecs-strings/-/codecs-strings-5.5.1.tgz",
       "integrity": "sha512-7klX4AhfHYA+uKKC/nxRGP2MntbYQCR3N6+v7bk1W/rSxYuhNmt+FN8aoThSZtWIKwN6BEyR1167ka8Co1+E7A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/codecs-core": "5.5.1",
         "@solana/codecs-numbers": "5.5.1",
@@ -3797,6 +3824,7 @@
       "resolved": "https://registry.npmjs.org/@solana/errors/-/errors-5.5.1.tgz",
       "integrity": "sha512-vFO3p+S7HoyyrcAectnXbdsMfwUzY2zYFUc2DEe5BwpiE9J1IAxPBGjOWO6hL1bbYdBrlmjNx8DXCslqS+Kcmg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chalk": "5.6.2",
         "commander": "14.0.2"
@@ -3821,6 +3849,7 @@
       "resolved": "https://registry.npmjs.org/@solana/nominal-types/-/nominal-types-5.5.1.tgz",
       "integrity": "sha512-I1ImR+kfrLFxN5z22UDiTWLdRZeKtU0J/pkWkO8qm/8WxveiwdIv4hooi8pb6JnlR4mSrWhq0pCIOxDYrL9GIQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20.18.0"
       },
@@ -3838,6 +3867,7 @@
       "resolved": "https://registry.npmjs.org/@solana/options/-/options-5.5.1.tgz",
       "integrity": "sha512-eo971c9iLNLmk+yOFyo7yKIJzJ/zou6uKpy6mBuyb/thKtS/haiKIc3VLhyTXty3OH2PW8yOlORJnv4DexJB8A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/codecs-core": "5.5.1",
         "@solana/codecs-data-structures": "5.5.1",
@@ -3862,6 +3892,7 @@
       "resolved": "https://registry.npmjs.org/@solana/rpc-spec/-/rpc-spec-5.5.1.tgz",
       "integrity": "sha512-m3LX2bChm3E3by4mQrH4YwCAFY57QBzuUSWqlUw7ChuZ+oLLOq7b2czi4i6L4Vna67j3eCmB3e+4tqy1j5wy7Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/errors": "5.5.1",
         "@solana/rpc-spec-types": "5.5.1"
@@ -3883,6 +3914,7 @@
       "resolved": "https://registry.npmjs.org/@solana/rpc-spec-types/-/rpc-spec-types-5.5.1.tgz",
       "integrity": "sha512-6OFKtRpIEJQs8Jb2C4OO8KyP2h2Hy1MFhatMAoXA+0Ik8S3H+CicIuMZvGZ91mIu/tXicuOOsNNLu3HAkrakrw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20.18.0"
       },
@@ -3900,6 +3932,7 @@
       "resolved": "https://registry.npmjs.org/@solana/rpc-types/-/rpc-types-5.5.1.tgz",
       "integrity": "sha512-bibTFQ7PbHJJjGJPmfYC2I+/5CRFS4O2p9WwbFraX1Keeel+nRrt/NBXIy8veP5AEn2sVJIyJPpWBRpCx1oATA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@solana/addresses": "5.5.1",
         "@solana/codecs-core": "5.5.1",
@@ -3949,6 +3982,7 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
       "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20"
       }
@@ -4069,7 +4103,6 @@
       "integrity": "sha512-BOziFIfE+6osHO9FoJG4zjoHUcvI7fTNBSpdAwrNH0/TLvzjsk2oo8XSSOT2HhqUyhZPfHv4UOffoJ9oEEQ7Ag==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
         "@typescript-eslint/scope-manager": "8.59.1",
@@ -4099,7 +4132,6 @@
       "integrity": "sha512-HDQH9O/47Dxi1ceDhBXdaldtf/WV9yRYMjbjCuNk3qnaTD564qwv61Y7+gTxwxRKzSrgO5uhtw584igXVuuZkA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.59.1",
         "@typescript-eslint/types": "8.59.1",
@@ -4943,7 +4975,6 @@
       "resolved": "https://registry.npmjs.org/@wagmi/core/-/core-3.4.7.tgz",
       "integrity": "sha512-OdqGDB8ewTQzesrtf6BmixFa+BWeWw7G/htUyUGXlew89kT+E2NRDX4Sfb+6F/Oqj6y41o5zSr36xHtbVUt4NA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "eventemitter3": "5.0.1",
         "mipd": "0.0.7",
@@ -5127,7 +5158,6 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5693,6 +5723,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.3.tgz",
       "integrity": "sha512-fasDH2ont2GqF5HpyO4w0+BcewlhHEZOFn9c1ckZdHpJ56Qb7MHhH/IcJZbBGgvdtwdwNbLvxiBEdg336iA9Sg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "^2.0.0"
       },
@@ -5705,6 +5736,7 @@
       "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"
       }
@@ -5714,6 +5746,7 @@
       "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.4.tgz",
       "integrity": "sha512-Bb6Cq8oq0IjDOe8wJmi4JeNn763Xs9cfrBcaylK1tPypWzyoy2G3l90v9k64kjphl/ZJjPIShFztenRomi8WTg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "^2.0.0"
       },
@@ -6253,7 +6286,6 @@
       "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -6330,7 +6362,6 @@
       "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -6457,7 +6488,6 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -6764,7 +6794,6 @@
       "integrity": "sha512-EFNNzu4HqtTRb5DJINpyd+u3bDdzETWDMpCzG+UBHz1tpsnMDCeOcf61u4Wy/cbXnMymK+MT9bjH7KcG1fItSw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -8334,7 +8363,6 @@
       "integrity": "sha512-75EA7EWZExL/j+MDKQrRbdzcRI2HOkRlmUw8fZJc1ioqFEOvBsq7Rt+A6yCxOt9w/TYNpkt52gC6nm/g5tFIng==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "acorn": "^8.5.0",
         "eslint-visitor-keys": "^5.0.0",
@@ -9438,7 +9466,6 @@
       "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -9507,7 +9534,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.5.tgz",
       "integrity": "sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -10454,8 +10480,7 @@
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.4.tgz",
       "integrity": "sha512-HhKppgO81FQof5m6TEnuBWCZGgfRAWbaeOaGT00KOy/Pf/j6oUihdvBpA7ltCeAvZpFhW3j0PTclkxsd4IXYDA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/tapable": {
       "version": "2.3.3",
@@ -10526,7 +10551,6 @@
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -10698,7 +10722,6 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -10763,7 +10786,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "napi-postinstall": "^0.3.0"
       },
@@ -10838,7 +10860,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@noble/curves": "1.9.1",
         "@noble/hashes": "1.8.0",
@@ -10933,7 +10954,6 @@
       "integrity": "sha512-t7g7GVRpMXjNpa67HaVWI/8BWtdVIQPCL2WoozXXA7LBGEFK4AkkKkHx2hAQf5x1GZSlcmEDPkVLSGahxnEEZw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "lightningcss": "^1.32.0",
         "picomatch": "^4.0.4",
@@ -11031,7 +11051,6 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.33.tgz",
       "integrity": "sha512-1AgChhx5w3ALgT4oK3acm2Es/7jyZhWSVUfs3rOBlGQC0rjEDkS7G4lWlJJGGNQD+BV3reCwbQrOe1mPNwKHBQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.33",
         "@vue/compiler-sfc": "3.5.33",
@@ -11080,7 +11099,6 @@
       "integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0 || ^9.0.0",
@@ -11360,7 +11378,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
       "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -11427,7 +11444,6 @@
       "integrity": "sha512-odxVsHAkZYYglR30aPYRY4nUGJnoJ2y1ww2HDvZALo0BDETv9kWbi16J52eHs+PWRNmF4ub6nZqfVOeesOvntg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.0.0",
         "yaml": "^2.0.0"
diff --git a/demo/vue-app-new/src/MainView.vue b/demo/vue-app-new/src/MainView.vue
index 71dd8b20f..e8f344511 100644
--- a/demo/vue-app-new/src/MainView.vue
+++ b/demo/vue-app-new/src/MainView.vue
@@ -1,34 +1,34 @@
 <script setup lang="ts">
-import { SmartAccountType } from "@toruslabs/ethereum-controllers";
-import { CookieStorage, LocalStorageAdapter, MemoryStorage, SessionStorageAdapter, type StorageConfig, WEB3AUTH_NETWORK } from "@web3auth/auth";
 import {
-  type AccountAbstractionMultiChainConfig,
   authConnector,
   CHAIN_NAMESPACES,
   type ConnectorFn,
-  type ConnectorsModalConfig,
   type CustomChainConfig,
-  log,
-  type LoginMethodConfig,
   type PluginFn,
   storageAvailable,
   WALLET_CONNECTORS,
   walletServicesPlugin,
+  type AccountAbstractionMultiChainConfig,
   type Web3AuthOptions,
+  type ConnectorsModalConfig,
+  type LoginMethodConfig,
 } from "@web3auth/modal";
+
 import { type Web3AuthContextConfig, Web3AuthProvider } from "@web3auth/modal/vue";
 import { SolanaProvider } from "@web3auth/modal/vue/solana";
 import { WagmiProvider } from "@web3auth/modal/vue/wagmi";
 import { coinbaseConnector } from "@web3auth/no-modal/connectors/coinbase-connector";
-import { WS_EMBED_LOGIN_MODE } from "@web3auth/ws-embed";
 import { computed, onBeforeMount, ref, watch } from "vue";
 
+import { CookieStorage, LocalStorageAdapter, log, MemoryStorage, SessionStorageAdapter, WEB3AUTH_NETWORK, type StorageConfig } from "@web3auth/auth";
 import AppDashboard from "./components/AppDashboard.vue";
 import AppHeader from "./components/AppHeader.vue";
 import AppSettings from "./components/AppSettings.vue";
 import { clientIds, resolveBuildEnv } from "./config";
 import { formDataStore } from "./store/form";
 import { getChainConfig } from "./utils/chainconfig";
+import { SmartAccountType } from "@toruslabs/ethereum-controllers";
+import { WS_EMBED_LOGIN_MODE } from "@web3auth/ws-embed";
 
 const formData = formDataStore;
 
diff --git a/demo/vue-app-new/src/components/AccountLinkingSection.vue b/demo/vue-app-new/src/components/AccountLinkingSection.vue
new file mode 100644
index 000000000..cddfe628d
--- /dev/null
+++ b/demo/vue-app-new/src/components/AccountLinkingSection.vue
@@ -0,0 +1,247 @@
+<script setup lang="ts">
+import { Button, Card, Select } from "@toruslabs/vue-components";
+import { WALLET_CONNECTORS } from "@web3auth/modal";
+import { useLinkAccount, useSwitchAccount } from "@web3auth/modal/account-linking/vue";
+import type { LinkedAccountInfo } from "@web3auth/no-modal";
+import { useWallets } from "@web3auth/no-modal/account-linking/vue";
+import { computed, onMounted, ref } from "vue";
+
+const props = defineProps<{
+  showLinkWallet: boolean;
+  printToConsole: (title: string, payload: unknown) => void;
+}>();
+
+const { linkAccount, unlinkAccount, loading: accountLinkingLoading, error: accountLinkingError } = useLinkAccount();
+const { switchAccount, loading: switchAccountLoading, error: switchAccountError } = useSwitchAccount();
+const { wallets, getWallets } = useWallets();
+
+const linkConnector = ref<string>(WALLET_CONNECTORS.METAMASK);
+const lastUnlinkedAddress = ref<string | null>(null);
+const pendingUnlinkAddress = ref<string | null>(null);
+const pendingSwitchAccountId = ref<string | null>(null);
+const lastSwitchAuthConnectionId = ref<string | null>(null);
+
+const linkConnectorOptions = computed(() => [
+  { name: "MetaMask", value: WALLET_CONNECTORS.METAMASK },
+  { name: "Phantom", value: "phantom" },
+  { name: "WalletConnect", value: WALLET_CONNECTORS.WALLET_CONNECT_V2 },
+]);
+
+const onSwitchToConnectedWallet = async (account: LinkedAccountInfo) => {
+  lastSwitchAuthConnectionId.value = null;
+  pendingSwitchAccountId.value = account.id;
+  await switchAccount(account);
+  pendingSwitchAccountId.value = null;
+  if (!switchAccountError.value) {
+    await getWallets();
+    lastSwitchAuthConnectionId.value = account.id;
+    props.printToConsole("Switch connected wallet", {
+      accountId: account.id,
+      accountType: account.accountType,
+      eoaAddress: account.eoaAddress,
+    });
+  }
+};
+
+const onLinkAccount = async () => {
+  lastUnlinkedAddress.value = null;
+  const result = await linkAccount({ connectorName: linkConnector.value });
+  if (result) {
+    await getWallets();
+    props.printToConsole("Link Wallet Result", result);
+  }
+};
+
+const onUnlinkAccount = async (address: string) => {
+  lastUnlinkedAddress.value = null;
+  pendingUnlinkAddress.value = address;
+
+  const result = await unlinkAccount(address);
+  pendingUnlinkAddress.value = null;
+
+  if (result) {
+    await getWallets();
+    lastUnlinkedAddress.value = address;
+    props.printToConsole("Unlink Wallet Result", result);
+  }
+};
+
+const canUnlinkConnectedWallet = (account: LinkedAccountInfo): boolean => {
+  return !account.isPrimary && !account.active && Boolean(account.eoaAddress);
+};
+
+const formatAddress = (address?: string | null): string => {
+  if (!address) {
+    return "No address available";
+  }
+
+  if (address.startsWith("0x") && address.length > 9) {
+    return `${address.slice(0, 5)}...${address.slice(-4)}`;
+  }
+
+  if (address.length > 8) {
+    return `${address.slice(0, 4)}...${address.slice(-4)}`;
+  }
+
+  return address;
+};
+
+const getWalletCardClasses = (account: LinkedAccountInfo): string => {
+  if (account.active) {
+    return "border-app-green-200 bg-app-green-50 shadow-md ring-1 ring-app-green-200 dark:border-app-green-700 dark:bg-app-gray-800 dark:ring-app-green-700";
+  }
+
+  return "border-app-gray-200 bg-app-white shadow-sm dark:border-app-gray-700 dark:bg-app-gray-800";
+};
+
+onMounted(async () => {
+  await getWallets();
+});
+</script>
+
+<template>
+  <Card class="mb-2 !h-auto gap-4 overflow-hidden px-4 py-4" :shadow="false">
+    <div class="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
+      <div class="min-w-0">
+        <div class="text-left text-xl font-bold leading-tight text-app-gray-900 dark:text-app-white">Connected Wallets</div>
+        <p class="mt-1 break-all text-xs leading-5 text-app-gray-500 dark:text-app-gray-300">
+          Loaded from
+          <code class="rounded-md bg-app-gray-100 px-1.5 py-0.5 font-medium text-app-gray-700 dark:bg-app-gray-800 dark:text-app-gray-200">
+            wallets
+          </code>
+        </p>
+        <p class="mt-1 break-all text-xs leading-5 text-app-gray-500 dark:text-app-gray-300">
+          Switch the active wallet here. Non-primary inactive wallets can also be unlinked.
+        </p>
+      </div>
+      <p
+        class="inline-flex self-start rounded-full bg-app-gray-100 px-3 py-1 text-xs font-semibold text-app-gray-700 dark:bg-app-gray-800 dark:text-app-gray-200"
+      >
+        Total: {{ wallets.length }}
+      </p>
+    </div>
+
+    <div class="flex flex-col gap-2">
+      <p
+        v-if="lastSwitchAuthConnectionId"
+        class="break-all rounded-xl border border-app-green-200 bg-app-green-50 px-3 py-2 text-xs leading-5 text-app-green-700 dark:border-app-green-700 dark:bg-app-gray-800 dark:text-app-green-400"
+      >
+        Switched active wallet (accountId: {{ lastSwitchAuthConnectionId }}).
+      </p>
+      <p
+        v-if="lastUnlinkedAddress"
+        class="break-all rounded-xl border border-app-green-200 bg-app-green-50 px-3 py-2 text-xs leading-5 text-app-green-700 dark:border-app-green-700 dark:bg-app-gray-800 dark:text-app-green-400"
+      >
+        Unlinked wallet: {{ lastUnlinkedAddress }}.
+      </p>
+      <p
+        v-if="switchAccountError"
+        class="break-all rounded-xl border border-app-red-200 bg-app-red-50 px-3 py-2 text-xs leading-5 text-app-red-700 dark:border-app-red-700 dark:bg-app-gray-800 dark:text-app-red-400"
+      >
+        Switch account: {{ switchAccountError.message }}
+      </p>
+      <p
+        v-if="accountLinkingError"
+        class="break-all rounded-xl border border-app-red-200 bg-app-red-50 px-3 py-2 text-xs leading-5 text-app-red-700 dark:border-app-red-700 dark:bg-app-gray-800 dark:text-app-red-400"
+      >
+        Link or unlink wallet: {{ accountLinkingError.message }}
+      </p>
+    </div>
+
+    <div v-if="wallets.length" class="mt-2 space-y-3">
+      <div v-for="account in wallets" :key="account.id" class="rounded-2xl border p-4 transition-colors" :class="getWalletCardClasses(account)">
+        <div class="flex items-start justify-between gap-3">
+          <div class="min-w-0 flex-1">
+            <p class="truncate text-sm font-semibold text-app-gray-900 dark:text-app-white" :title="account.eoaAddress || undefined">
+              {{ formatAddress(account.eoaAddress) }}
+            </p>
+            <p class="mt-1 break-all text-xs leading-5 text-app-gray-500 dark:text-app-gray-300">
+              {{ account.connector }}
+              <span v-if="account.accountType">· {{ account.accountType }}</span>
+              <span v-if="account.chainNamespace">· {{ account.chainNamespace }}</span>
+            </p>
+          </div>
+          <div class="flex shrink-0 flex-wrap items-center gap-1">
+            <span
+              v-if="account.active"
+              class="rounded-full bg-app-green-100 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-app-green-700 dark:bg-app-green-900 dark:text-app-green-300"
+            >
+              Active
+            </span>
+            <span
+              v-if="account.isPrimary"
+              class="rounded-full bg-app-blue-100 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-app-blue-700 dark:bg-app-blue-900 dark:text-app-blue-300"
+            >
+              Primary
+            </span>
+          </div>
+        </div>
+
+        <p
+          v-if="account.authConnectionId"
+          class="mt-2 truncate text-xs leading-5 text-app-gray-400 dark:text-app-gray-400"
+          :title="`authConnectionId: ${account.authConnectionId}`"
+        >
+          authConnectionId: {{ account.authConnectionId }}
+        </p>
+        <p
+          v-if="account.aaAddress"
+          class="mt-2 truncate text-xs leading-5 text-app-gray-400 dark:text-app-gray-400"
+          :title="`Smart account: ${account.aaAddress}`"
+        >
+          Smart account: {{ account.aaAddress }}
+        </p>
+
+        <p v-if="account.active" class="mt-3 text-xs leading-5 font-medium text-app-green-700 dark:text-app-green-400">
+          Currently used for wallet actions
+          <span v-if="!account.isPrimary">. Switch to another wallet before unlinking it.</span>
+        </p>
+        <p v-else-if="account.isPrimary" class="mt-3 text-xs leading-5 text-app-blue-700 dark:text-app-blue-400">
+          Primary AUTH account stays linked and can be switched back to at any time.
+        </p>
+        <p v-else-if="!account.address" class="mt-3 text-xs leading-5 text-app-gray-500 dark:text-app-gray-300">
+          This wallet does not expose an unlinkable address.
+        </p>
+
+        <div v-if="!account.active || canUnlinkConnectedWallet(account)" class="mt-3 flex flex-col gap-2 sm:flex-row">
+          <Button
+            v-if="!account.active"
+            :loading="switchAccountLoading && pendingSwitchAccountId === account.id"
+            block
+            size="xs"
+            pill
+            class="!mb-0"
+            @click="onSwitchToConnectedWallet(account)"
+          >
+            Switch to this wallet
+          </Button>
+          <Button
+            v-if="canUnlinkConnectedWallet(account)"
+            :loading="accountLinkingLoading && pendingUnlinkAddress === account.eoaAddress"
+            block
+            size="xs"
+            pill
+            variant="tertiary"
+            class="!mb-0"
+            @click="onUnlinkAccount(account.eoaAddress)"
+          >
+            Unlink this wallet
+          </Button>
+        </div>
+      </div>
+    </div>
+
+    <p v-else class="text-xs leading-5 text-app-gray-500 dark:text-app-gray-300">No connected wallets found in user info yet.</p>
+  </Card>
+
+  <Card v-if="showLinkWallet" class="mb-2 !h-auto gap-4 overflow-hidden px-4 py-4" :shadow="false">
+    <div class="text-left text-xl font-bold leading-tight text-app-gray-900 dark:text-app-white">Link Wallet</div>
+    <p class="mt-1 break-all text-xs leading-5 text-app-gray-500 dark:text-app-gray-300">
+      Choose a wallet connector to start the account-linking flow.
+    </p>
+    <div class="w-full">
+      <Select v-model="linkConnector" :options="linkConnectorOptions" placeholder="Select wallet" matchParentsWidth />
+    </div>
+    <Button :loading="accountLinkingLoading" block size="xs" pill class="!mb-0" @click="onLinkAccount">Link Wallet</Button>
+  </Card>
+</template>
diff --git a/demo/vue-app-new/src/components/AppDashboard.vue b/demo/vue-app-new/src/components/AppDashboard.vue
index 769b9e111..c5f850554 100644
--- a/demo/vue-app-new/src/components/AppDashboard.vue
+++ b/demo/vue-app-new/src/components/AppDashboard.vue
@@ -1,47 +1,40 @@
 <script setup lang="ts">
-import { createWalletTransactionSigner, toAddress } from "@solana/client";
-import { address as solanaAddress } from "@solana/kit";
-import { getTransferSolInstruction } from "@solana-program/system";
 import { Button, Card } from "@toruslabs/vue-components";
-import { getCallsStatus, getCapabilities, sendCalls, showCallsStatus } from "@wagmi/core";
-import {
-  useBalance,
-  useChainId,
-  useConfig,
-  useConnection,
-  useSignMessage,
-  useSignTypedData,
-  useSwitchChain as useWagmiSwitchChain,
-} from "@wagmi/vue";
 import { CHAIN_NAMESPACES, IProvider, log, WALLET_CONNECTORS } from "@web3auth/modal";
 import {
-  useAuthTokenInfo,
   useCheckout,
-  useEnableMFA,
   useFunding,
-  useManageMFA,
   useReceive,
+  useEnableMFA,
+  useAuthTokenInfo,
+  useManageMFA,
   useWalletConnectScanner,
   useWalletUI,
   useWeb3Auth,
   useWeb3AuthUser,
 } from "@web3auth/modal/vue";
-import { useSignMessage as useSolanaSignMessage, useSolanaClient, useSolanaWallet } from "@web3auth/modal/vue/solana";
 import { CONNECTOR_INITIAL_AUTHENTICATION_MODE } from "@web3auth/no-modal";
 import { useI18n } from "petite-vue-i18n";
+
+import { useSignMessage as useSolanaSignMessage, useSolanaWallet, useSolanaClient } from "@web3auth/modal/vue/solana";
+import { useConnection, useBalance, useSignMessage, useSignTypedData, useSwitchChain as useWagmiSwitchChain, useConfig } from "@wagmi/vue";
+import { getCapabilities, getCallsStatus, sendCalls, showCallsStatus } from "@wagmi/core";
 import { parseEther } from "viem";
+import { createWalletTransactionSigner, toAddress } from "@solana/client";
+import { address as solanaAddress } from "@solana/kit";
+import { getTransferSolInstruction } from "@solana-program/system";
 import { computed, ref, watch } from "vue";
-
+import AccountLinkingSection from "./AccountLinkingSection.vue";
+import X402Tester from "./X402Tester.vue";
 import { getPrivateKey, sendEth, sendEthWithSmartAccount, signTransaction as signEthTransaction } from "../services/ethHandlers";
 import { formDataStore } from "../store/form";
-import X402Tester from "./X402Tester.vue";
 
 const { t } = useI18n({ useScope: "global" });
 
 const formData = formDataStore;
 
 const { isConnected, connection, web3Auth, isMFAEnabled, isAuthorized } = useWeb3Auth();
-const { userInfo, loading: userInfoLoading } = useWeb3AuthUser();
+const { loading: userInfoLoading, getUserInfo } = useWeb3AuthUser();
 const { enableMFA } = useEnableMFA();
 const { manageMFA } = useManageMFA();
 const { mutateAsync: switchChainAsync } = useWagmiSwitchChain();
@@ -55,7 +48,6 @@ const { getAuthTokenInfo, loading: getAuthTokenInfoLoading } = useAuthTokenInfo(
 const { status, address } = useConnection();
 const { mutateAsync: signTypedDataAsync } = useSignTypedData();
 const { mutateAsync: signMessageAsync } = useSignMessage();
-const wagmiChainId = useChainId();
 const balance = useBalance({
   address: address,
 });
@@ -104,7 +96,7 @@ const isDisplay = (name: "dashboard" | "ethServices" | "solServices" | "walletSe
       return Boolean(conn?.solanaWallet);
 
     case "walletServices":
-      return web3Auth.value?.connectedConnectorName === WALLET_CONNECTORS.AUTH && Boolean(conn?.ethereumProvider || conn?.solanaWallet);
+      return web3Auth.value?.primaryConnectorName === WALLET_CONNECTORS.AUTH && Boolean(conn?.ethereumProvider || conn?.solanaWallet);
 
     default: {
       return false;
@@ -152,7 +144,8 @@ watch(
 
 // Ethereum Provider
 const onGetUserInfo = async () => {
-  printToConsole("User Info", userInfo.value);
+  const result = await getUserInfo();
+  printToConsole("User Info", result);
 };
 
 const onGetAuthTokenInfo = async () => {
@@ -180,7 +173,7 @@ const onGetPrivateKey = async () => {
 };
 
 const getConnectedChainId = async () => {
-  printToConsole("chainId", wagmiChainId.value);
+  printToConsole("chainId", web3Auth.value?.currentChain?.chainId);
 };
 
 const onGetBalance = async () => {
@@ -250,7 +243,7 @@ const onSendBatchCalls = async () => {
         { to: addr as `0x${string}`, value: parseEther("0.0001") },
         { to: addr as `0x${string}`, value: parseEther("0.0002") },
       ],
-      version: "2.0",
+      version: "2.0.0",
     });
     trackedCallsId.value = result.id;
     printToConsole("sendCalls result", result);
@@ -421,6 +414,7 @@ const onSwitchChain = async () => {
             {{ isMFAEnabled ? "Manage MFA" : "Enable MFA" }}
           </Button>
         </div>
+        <AccountLinkingSection :show-link-wallet="isDisplay('walletServices')" :print-to-console="printToConsole" />
         <!-- Wallet Services -->
         <Card v-if="isDisplay('walletServices')" class="!h-auto lg:!h-[calc(100dvh_-_240px)] gap-4 px-4 py-4 mb-2" :shadow="false">
           <div class="mb-2 text-xl font-bold leading-tight text-left">Wallet Service</div>
@@ -467,21 +461,13 @@ const onSwitchChain = async () => {
           <Button block size="xs" pill class="mb-2" @click="onGetBalance">
             {{ t("app.buttons.btnGetBalance") }}
           </Button>
-          <Button v-if="canSwitchEvmChain" block size="xs" pill class="mb-2" @click="onSwitchChain">
-            {{ t("app.buttons.btnSwitchChain") }}
-          </Button>
-          <Button block size="xs" pill class="mb-2" @click="onSendEth">
-            {{ t("app.buttons.btnSendEth") }}
-          </Button>
-          <Button v-if="isSmartAccount" block size="xs" pill class="mb-2" @click="onSendAATx">
-            {{ t("app.buttons.btnSendAATx") }}
-          </Button>
+          <Button v-if="canSwitchEvmChain" block size="xs" pill class="mb-2" @click="onSwitchChain">{{ t("app.buttons.btnSwitchChain") }}</Button>
+          <Button block size="xs" pill class="mb-2" @click="onSendEth">{{ t("app.buttons.btnSendEth") }}</Button>
+          <Button v-if="isSmartAccount" block size="xs" pill class="mb-2" @click="onSendAATx">{{ t("app.buttons.btnSendAATx") }}</Button>
           <Button block size="xs" pill class="mb-2" @click="onSignEthTransaction">
             {{ t("app.buttons.btnSignTransaction") }}
           </Button>
-          <Button block size="xs" pill class="mb-2" @click="onSignEthMessage">
-            {{ t("app.buttons.btnSignEthMessage") }}
-          </Button>
+          <Button block size="xs" pill class="mb-2" @click="onSignEthMessage">{{ t("app.buttons.btnSignEthMessage") }}</Button>
           <Button block size="xs" pill class="mb-2" @click="getConnectedChainId">
             {{ t("app.buttons.btnGetConnectedChainId") }}
           </Button>
@@ -507,15 +493,9 @@ const onSwitchChain = async () => {
         <!-- SOLANA -->
         <Card v-if="isDisplay('solServices')" class="h-auto gap-4 px-4 py-4 mb-2" :shadow="false">
           <div class="mb-2 text-xl font-bold leading-tight text-left">Solana Transaction</div>
-          <Button block size="xs" pill class="mb-2" @click="onGetSolPrivateKey">
-            {{ t("app.buttons.btnGetPrivateKey") }}
-          </Button>
-          <Button block size="xs" pill class="mb-2" @click="onGetSolBalance">
-            {{ t("app.buttons.btnGetBalance") }}
-          </Button>
-          <Button block size="xs" pill class="mb-2" @click="onSignSolMessage">
-            {{ t("app.buttons.btnSignMessage") }}
-          </Button>
+          <Button block size="xs" pill class="mb-2" @click="onGetSolPrivateKey">{{ t("app.buttons.btnGetPrivateKey") }}</Button>
+          <Button block size="xs" pill class="mb-2" @click="onGetSolBalance">{{ t("app.buttons.btnGetBalance") }}</Button>
+          <Button block size="xs" pill class="mb-2" @click="onSignSolMessage">{{ t("app.buttons.btnSignMessage") }}</Button>
           <Button block size="xs" pill class="mb-2" @click="onSignAndSendTransaction">
             {{ t("app.buttons.btnSignAndSendTransaction") }}
           </Button>
diff --git a/demo/vue-app-new/src/components/AppHeader.vue b/demo/vue-app-new/src/components/AppHeader.vue
index 25b1494e3..019691d17 100644
--- a/demo/vue-app-new/src/components/AppHeader.vue
+++ b/demo/vue-app-new/src/components/AppHeader.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { Button } from "@toruslabs/vue-components";
 import { useWeb3Auth, useWeb3AuthDisconnect } from "@web3auth/modal/vue";
-import { CONNECTOR_INITIAL_AUTHENTICATION_MODE } from "@web3auth/no-modal";
 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" });
@@ -49,12 +48,8 @@ watch(status, () => {
       </div>
       <div id="navbar-sticky" class="items-center justify-between w-full md:flex md:w-auto md:order-1 text-center">
         <div v-if="isDisplay('appHeading')" class="max-sm:w-full max-sm:mt-4">
-          <h1 class="leading-tight text-2xl sm:text-3xl font-bold">
-            {{ $t("app.title") }}
-          </h1>
-          <p class="leading-tight text-lg sm:text-xl">
-            {{ $t("app.description") }}
-          </p>
+          <h1 class="leading-tight text-2xl sm:text-3xl font-bold">{{ $t("app.title") }}</h1>
+          <p class="leading-tight text-lg sm:text-xl">{{ $t("app.description") }}</p>
         </div>
       </div>
     </div>
diff --git a/demo/vue-app-new/src/components/AppSettings.vue b/demo/vue-app-new/src/components/AppSettings.vue
index fc85063d4..54af58732 100644
--- a/demo/vue-app-new/src/components/AppSettings.vue
+++ b/demo/vue-app-new/src/components/AppSettings.vue
@@ -3,7 +3,7 @@ import { Button, Card, Select, Tab, Tabs, Tag, TextField, Toggle } from "@torusl
 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 { getChainConfig } from "../utils/chainconfig";
 import {
   buildEnvOptions,
   chainConfigs,
@@ -18,7 +18,6 @@ import {
   SmartAccountOptions,
 } from "../config";
 import { formDataStore } from "../store/form";
-import { getChainConfig } from "../utils/chainconfig";
 
 const formData = formDataStore;
 
@@ -134,16 +133,14 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
       <Card
         class="h-auto p-4 sm:p-8 col-span-8 sm:col-span-6 lg:col-span-4 max-sm:!shadow-none max-sm:!border-0 !w-full [@media(min-width:900px)]:!min-w-[700px] [@media(min-width:1200px)]:!min-w-[800px] [@media(min-width:1500px)]:!w-[800px]"
       >
-        <div class="text-2xl font-bold leading-tight text-center sm:text-3xl">
-          {{ $t("app.greeting") }}
-        </div>
+        <div class="text-2xl font-bold leading-tight text-center sm:text-3xl">{{ $t("app.greeting") }}</div>
         <div class="my-4 font-extrabold leading-tight text-center flex items-center justify-center gap-2">
           <Select
             v-model="formData.widget"
             data-testid="selectWidget"
             :aria-label="$t('app.widget.title')"
             :placeholder="$t('app.widget.title')"
-            match-parents-width
+            matchParentsWidth
             :options="[
               { name: $t('app.widget.embed'), value: 'embed' },
               { name: $t('app.widget.modal'), value: 'modal' },
@@ -184,7 +181,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             aria-label="Build Environment"
             placeholder="Build Environment"
             :options="buildEnvOptions"
-            match-parents-width
+            matchParentsWidth
           />
           <Select
             v-model="formData.network"
@@ -193,7 +190,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :aria-label="$t('app.network')"
             :placeholder="$t('app.network')"
             :options="networkOptions"
-            match-parents-width
+            matchParentsWidth
           />
           <Select
             v-model="formData.chainNamespaces"
@@ -203,7 +200,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :placeholder="$t('app.chainNamespaces')"
             :options="chainNamespaceOptions"
             :multiple="true"
-            match-parents-width
+            matchParentsWidth
             @update:model-value="onChainNamespaceChange"
           />
           <Select
@@ -213,7 +210,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :aria-label="$t('app.chains')"
             :placeholder="$t('app.chains')"
             :multiple="true"
-            match-parents-width
+            matchParentsWidth
             :options="chainOptions"
             @update:model-value="onChainChange"
           />
@@ -223,7 +220,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :label="$t('app.defaultChainId')"
             :aria-label="$t('app.defaultChainId')"
             :placeholder="$t('app.defaultChainId')"
-            match-parents-width
+            matchParentsWidth
             :options="defaultChainOptions"
           />
           <Select
@@ -234,7 +231,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :placeholder="$t('app.connectors')"
             :options="connectorOptions"
             multiple
-            match-parents-width
+            matchParentsWidth
             :show-check-box="true"
           />
           <Select
@@ -247,7 +244,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
               { name: 'Connect Only', value: 'connect-only' },
               { name: 'Connect and Sign', value: 'connect-and-sign' },
             ]"
-            match-parents-width
+            matchParentsWidth
           />
           <Select
             v-model="formData.consentConfigMode"
@@ -256,7 +253,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :aria-label="$t('app.consentConfig')"
             :placeholder="$t('app.consentConfig')"
             :options="consentConfigOptions"
-            match-parents-width
+            matchParentsWidth
           />
           <Toggle
             v-model="formData.showWalletDiscovery"
@@ -298,7 +295,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
               { name: 'Cookies', value: 'cookies' },
               { name: 'Memory (no persist)', value: 'memory' },
             ]"
-            match-parents-width
+            matchParentsWidth
           />
         </Card>
         <Card v-if="isActiveTab(1)" class="grid grid-cols-1 gap-2 px-4 py-4 sm:grid-cols-2" :shadow="false">
@@ -342,7 +339,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :aria-label="$t('app.whiteLabel.defaultLanguage')"
             :placeholder="$t('app.whiteLabel.defaultLanguage')"
             :options="languageOptions"
-            match-parents-width
+            matchParentsWidth
             :disabled="isDisabled('whiteLabelSettings')"
           />
           <TextField
@@ -422,13 +419,11 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :placeholder="$t('app.loginProviders')"
             :options="loginProviderOptions"
             multiple
-            match-parents-width
+            matchParentsWidth
             class=""
           />
           <Card v-for="p in formData.loginProviders" :key="p" :shadow="false" class="grid grid-cols-1 gap-2 px-4 py-4 sm:grid-cols-3">
-            <div class="font-bold leading-tight text-left">
-              {{ p }}
-            </div>
+            <div class="font-bold leading-tight text-left">{{ p }}</div>
             <Toggle
               v-model="formData.loginMethods[p]!.mainOption"
               :show-label="true"
@@ -493,7 +488,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :aria-label="$t('app.walletPlugin.confirmationStrategy')"
             :placeholder="$t('app.walletPlugin.confirmationStrategy')"
             :options="confirmationStrategyOptions"
-            match-parents-width
+            matchParentsWidth
             class=""
           />
         </Card>
@@ -525,7 +520,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :placeholder="$t('app.accountAbstractionProvider.smartAccountType')"
             :options="SmartAccountOptions"
             :disabled="isDisabled('smartAccountType')"
-            match-parents-width
+            matchParentsWidth
           />
           <Select
             v-model="formData.smartAccountChains"
@@ -535,25 +530,23 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
             :placeholder="$t('app.chains')"
             :options="aaSupportedChains"
             multiple
-            match-parents-width
+            matchParentsWidth
             :disabled="isDisabled('smartAccountChains')"
             @update:model-value="onSmartAccountChainChange"
           />
           <Card v-for="c in formData.smartAccountChains" :key="c" :shadow="false" class="gap-2 px-4 py-4">
-            <div class="font-bold leading-tight text-left sm:col-span-2">
-              {{ c }}
-            </div>
+            <div class="font-bold leading-tight text-left sm:col-span-2">{{ c }}</div>
             <TextField
-              v-model="formData.smartAccountChainsConfig[c].bundlerUrl"
               class="mt-3"
+              v-model="formData.smartAccountChainsConfig[c].bundlerUrl"
               :label="$t('app.accountAbstractionProvider.bundlerUrl')"
               :aria-label="$t('app.accountAbstractionProvider.bundlerUrl')"
               :placeholder="$t('app.accountAbstractionProvider.bundlerUrl')"
               :disabled="isDisabled('bundlerUrl')"
             />
             <TextField
-              v-model="formData.smartAccountChainsConfig[c].paymasterUrl"
               class="mt-3"
+              v-model="formData.smartAccountChainsConfig[c].paymasterUrl"
               :label="$t('app.accountAbstractionProvider.paymasterUrl')"
               :aria-label="$t('app.accountAbstractionProvider.paymasterUrl')"
               :placeholder="$t('app.accountAbstractionProvider.paymasterUrl')"
diff --git a/demo/vue-app-new/src/components/X402Tester.vue b/demo/vue-app-new/src/components/X402Tester.vue
index 893cd9aeb..1a152e83d 100644
--- a/demo/vue-app-new/src/components/X402Tester.vue
+++ b/demo/vue-app-new/src/components/X402Tester.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { Button, Card } from "@toruslabs/vue-components";
 import { useSwitchChain } from "@wagmi/vue";
-import { useChain, useWeb3Auth } from "@web3auth/modal/vue";
 import { useX402Fetch } from "@web3auth/modal/x402/vue";
+import { useChain, useWeb3Auth } from "@web3auth/modal/vue";
 import { CHAIN_NAMESPACES } from "@web3auth/no-modal";
 import { ref, watch } from "vue";
 
diff --git a/demo/vue-app-new/src/main.ts b/demo/vue-app-new/src/main.ts
index 93aedabf1..abea3abe0 100644
--- a/demo/vue-app-new/src/main.ts
+++ b/demo/vue-app-new/src/main.ts
@@ -1,4 +1,4 @@
-// import "./global";
+import "./global";
 import "./style.css";
 
 import { VueQueryPlugin } from "@tanstack/vue-query";
diff --git a/demo/vue-app-new/src/shims-vue.d.ts b/demo/vue-app-new/src/shims-vue.d.ts
index 3804a43e2..55e0ca6b8 100644
--- a/demo/vue-app-new/src/shims-vue.d.ts
+++ b/demo/vue-app-new/src/shims-vue.d.ts
@@ -1,6 +1,6 @@
 /* eslint-disable */
-declare module '*.vue' {
-  import type { DefineComponent } from 'vue'
-  const component: DefineComponent<{}, {}, any>
-  export default component
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
 }
diff --git a/demo/wagmi-react-app/package-lock.json b/demo/wagmi-react-app/package-lock.json
index a5b93fbbe..dca97fbfe 100644
--- a/demo/wagmi-react-app/package-lock.json
+++ b/demo/wagmi-react-app/package-lock.json
@@ -6349,6 +6349,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
diff --git a/demo/wagmi-react-app/src/components/Main.tsx b/demo/wagmi-react-app/src/components/Main.tsx
index 78fc8fc08..ee1c69989 100644
--- a/demo/wagmi-react-app/src/components/Main.tsx
+++ b/demo/wagmi-react-app/src/components/Main.tsx
@@ -1,9 +1,10 @@
-import { CHAIN_NAMESPACES } from "@web3auth/modal";
+import { CHAIN_NAMESPACES, WALLET_CONNECTORS } from "@web3auth/modal";
+import { useLinkAccount } from "@web3auth/modal/account-linking/react";
 import {
+  useAuthTokenInfo,
   useChain,
   useCheckout,
   useEnableMFA,
-  useAuthTokenInfo,
   useManageMFA,
   useSwitchChain as useWeb3AuthSwitchChain,
   useWalletConnectScanner,
@@ -14,6 +15,7 @@ import {
   useWeb3AuthUser,
 } from "@web3auth/modal/react";
 import { useSolanaWallet } from "@web3auth/modal/react/solana";
+import type { LinkAccountResult } from "@web3auth/no-modal";
 import { useMemo, useState } from "react";
 import { parseEther } from "viem";
 import {
@@ -81,6 +83,11 @@ const Main = ({ consentConfigMode, onConsentConfigModeChange }: MainProps) => {
   // EIP-5792: Show Calls Status in Wallet UI
   const { showCallsStatus, isPending: isShowCallsStatusPending, error: showCallsStatusError } = useShowCallsStatus();
 
+  // Account Linking
+  const { linkAccount, loading: isLinkAccountLoading, error: linkAccountError } = useLinkAccount();
+  const [linkConnector, setLinkConnector] = useState<string>(WALLET_CONNECTORS.METAMASK);
+  const [linkAccountResult, setLinkAccountResult] = useState<LinkAccountResult | null>(null);
+
   const chainNamespaces = useMemo(() => {
     if (status && web3Auth?.coreOptions?.chains) {
       return [...new Set(web3Auth.coreOptions.chains.map((x) => x.chainNamespace) || [])];
@@ -342,6 +349,42 @@ const Main = ({ consentConfigMode, onConsentConfigModeChange }: MainProps) => {
           ))}
         </div>
 
+        {/* Account Linking */}
+        <div style={{ marginTop: "16px", marginBottom: "16px" }}>
+          <p>Link Wallet</p>
+          <select
+            value={linkConnector}
+            onChange={(e) => {
+              setLinkConnector(e.target.value);
+              setLinkAccountResult(null);
+            }}
+            style={{ marginBottom: "8px", padding: "8px", width: "100%" }}
+          >
+            <option value={WALLET_CONNECTORS.METAMASK}>MetaMask</option>
+            <option value={WALLET_CONNECTORS.WALLET_CONNECT_V2}>WalletConnect</option>
+          </select>
+          {isLinkAccountLoading ? (
+            <p>Linking wallet...</p>
+          ) : (
+            <button
+              onClick={async () => {
+                const result = await linkAccount({ connectorName: linkConnector });
+                if (result) setLinkAccountResult(result);
+              }}
+              className={styles.card}
+            >
+              Link Wallet
+            </button>
+          )}
+          {linkAccountResult && (
+            <div>
+              <p style={{ color: "green" }}>Wallet linked successfully!</p>
+              <textarea disabled rows={4} value={JSON.stringify(linkAccountResult, null, 2)} style={{ width: "100%" }} />
+            </div>
+          )}
+          {linkAccountError && <p style={{ color: "red" }}>Error: {linkAccountError.message}</p>}
+        </div>
+
         {/* X402 Payment Protocol */}
         <X402 />
 
diff --git a/package-lock.json b/package-lock.json
index 943e49f43..05eaca4b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3243,90 +3243,6 @@
         "node": "^18.18 || >=20"
       }
     },
-    "node_modules/@metamask/connect-evm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@metamask/connect-evm/-/connect-evm-1.0.0.tgz",
-      "integrity": "sha512-Tqn+WcOefgYF4qck4Xzhx1n6TFr+6Sphcn1q6/5GJwMmycRRr6vDP8hfVP7sL7v+yYAkzDSPu7KUduOdLYjX4A==",
-      "dev": true,
-      "license": "SEE LICENSE IN LICENSE",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@metamask/analytics": "^0.4.0",
-        "@metamask/chain-agnostic-permission": "^1.2.2",
-        "@metamask/connect-multichain": "^0.12.1",
-        "@metamask/utils": "^11.8.1"
-      },
-      "engines": {
-        "node": ">=20.19.0"
-      }
-    },
-    "node_modules/@metamask/connect-multichain": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@metamask/connect-multichain/-/connect-multichain-0.12.1.tgz",
-      "integrity": "sha512-v8rYIdhrnN3m8HhjIkiRjn0hXSoKEW0dT5idpsJ/q//EBXJfn/s1FWLgNJCwoTFM60wJah0hHk4gz6XZF/BZCg==",
-      "dev": true,
-      "license": "SEE LICENSE IN LICENSE",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@metamask/analytics": "^0.4.0",
-        "@metamask/mobile-wallet-protocol-core": "^0.4.0",
-        "@metamask/mobile-wallet-protocol-dapp-client": "^0.3.0",
-        "@metamask/multichain-api-client": "^0.10.1",
-        "@metamask/multichain-ui": "^0.4.1",
-        "@metamask/onboarding": "^1.0.1",
-        "@metamask/rpc-errors": "^7.0.3",
-        "@metamask/utils": "^11.8.1",
-        "@paulmillr/qr": "^0.2.1",
-        "bowser": "^2.11.0",
-        "buffer": "^6.0.3",
-        "cross-fetch": "^4.1.0",
-        "eciesjs": "0.4.17",
-        "eventemitter3": "^5.0.1",
-        "pako": "^2.1.0",
-        "uuid": "^11.1.0",
-        "ws": "^8.18.3"
-      },
-      "engines": {
-        "node": ">=20.19.0"
-      },
-      "peerDependencies": {
-        "@react-native-async-storage/async-storage": "^1.23"
-      },
-      "peerDependenciesMeta": {
-        "@react-native-async-storage/async-storage": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@metamask/connect-multichain/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
     "node_modules/@metamask/controller-utils": {
       "version": "11.20.0",
       "resolved": "https://registry.npmjs.org/@metamask/controller-utils/-/controller-utils-11.20.0.tgz",
@@ -35825,7 +35741,7 @@
     },
     "packages/modal/node_modules/react": {
       "version": "19.2.6",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/react/-/react-19.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz",
       "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==",
       "dev": true,
       "license": "MIT",
@@ -35835,7 +35751,7 @@
     },
     "packages/modal/node_modules/react-dom": {
       "version": "19.2.6",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/react-dom/-/react-dom-19.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.6.tgz",
       "integrity": "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==",
       "dev": true,
       "license": "MIT",
@@ -35939,7 +35855,7 @@
     },
     "packages/no-modal/node_modules/@metamask/connect-evm": {
       "version": "1.1.0",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/@metamask/connect-evm/-/connect-evm-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@metamask/connect-evm/-/connect-evm-1.1.0.tgz",
       "integrity": "sha512-djkESGyDtEuZr+1XH/k/t5u11JGqrPaIxJ50rZRDXG9DsSJ7eQvwRvq74btx4dTh4e6e1xsLZ+cfd2gZDVBxXg==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -35954,7 +35870,7 @@
     },
     "packages/no-modal/node_modules/@metamask/connect-multichain": {
       "version": "0.13.0",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/@metamask/connect-multichain/-/connect-multichain-0.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/@metamask/connect-multichain/-/connect-multichain-0.13.0.tgz",
       "integrity": "sha512-nXIp/tzgoMQ4CzH79EoHP9Wtpxk5h3T+i7ESdDuwLxYhnuQEF2Yc5eSmUkhns/GUDTyRzT33unN6c2GVer5VMw==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -35990,7 +35906,7 @@
     },
     "packages/no-modal/node_modules/@metamask/connect-solana": {
       "version": "1.1.0",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/@metamask/connect-solana/-/connect-solana-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@metamask/connect-solana/-/connect-solana-1.1.0.tgz",
       "integrity": "sha512-4g32yw2IdihqDyGtoMftFpoSNCabeNIc/laHbp2eYrmMFJzvkG1+w4bS/b/Tf51EqiAANCjj4LHbMN3Gubd9UQ==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -36005,7 +35921,7 @@
     },
     "packages/no-modal/node_modules/buffer": {
       "version": "6.0.3",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/buffer/-/buffer-6.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
       "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "funding": [
         {
@@ -36029,7 +35945,7 @@
     },
     "packages/no-modal/node_modules/react": {
       "version": "19.2.6",
-      "resolved": "https://consensys.jfrog.io/artifactory/api/npm/npm/react/-/react-19.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz",
       "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==",
       "dev": true,
       "license": "MIT",
diff --git a/packages/modal/package.json b/packages/modal/package.json
index 63e818b03..b1325623c 100644
--- a/packages/modal/package.json
+++ b/packages/modal/package.json
@@ -112,6 +112,21 @@
       "require": "./dist/lib.cjs/packages/modal/src/index.js",
       "types": "./dist/lib.cjs/types/index.d.ts"
     },
+    "./account-linking": {
+      "import": "./dist/lib.esm/packages/modal/src/account-linking/index.js",
+      "require": "./dist/lib.cjs/packages/modal/src/account-linking/index.js",
+      "types": "./dist/lib.cjs/types/account-linking/index.d.ts"
+    },
+    "./account-linking/react": {
+      "import": "./dist/lib.esm/packages/modal/src/account-linking/react.js",
+      "require": "./dist/lib.cjs/packages/modal/src/account-linking/react.js",
+      "types": "./dist/lib.cjs/types/account-linking/react.d.ts"
+    },
+    "./account-linking/vue": {
+      "import": "./dist/lib.esm/packages/modal/src/account-linking/vue.js",
+      "require": "./dist/lib.cjs/packages/modal/src/account-linking/vue.js",
+      "types": "./dist/lib.cjs/types/account-linking/vue.d.ts"
+    },
     "./x402": {
       "import": "./dist/lib.esm/packages/modal/src/x402/index.js",
       "require": "./dist/lib.cjs/packages/modal/src/x402/index.js",
@@ -170,6 +185,15 @@
   },
   "typesVersions": {
     "*": {
+      "account-linking": [
+        "./dist/lib.cjs/types/account-linking/index.d.ts"
+      ],
+      "account-linking/react": [
+        "./dist/lib.cjs/types/account-linking/react.d.ts"
+      ],
+      "account-linking/vue": [
+        "./dist/lib.cjs/types/account-linking/vue.d.ts"
+      ],
       "x402": [
         "./dist/lib.cjs/types/x402/index.d.ts"
       ],
diff --git a/packages/modal/rollup.config.mjs b/packages/modal/rollup.config.mjs
index b2557460c..f7dd18acc 100644
--- a/packages/modal/rollup.config.mjs
+++ b/packages/modal/rollup.config.mjs
@@ -15,6 +15,9 @@ const allDeps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peer
 export const baseConfig = {
   input: [
     "./src/index.ts",
+    "./src/account-linking/index.ts",
+    "./src/account-linking/react.ts",
+    "./src/account-linking/vue.ts",
     "./src/x402/index.ts",
     "./src/x402/react.ts",
     "./src/x402/vue.ts",
diff --git a/packages/modal/src/account-linking/index.ts b/packages/modal/src/account-linking/index.ts
new file mode 100644
index 000000000..a410a3eee
--- /dev/null
+++ b/packages/modal/src/account-linking/index.ts
@@ -0,0 +1 @@
+export * from "@web3auth/no-modal/account-linking";
diff --git a/packages/modal/src/account-linking/react.ts b/packages/modal/src/account-linking/react.ts
new file mode 100644
index 000000000..8cdda6710
--- /dev/null
+++ b/packages/modal/src/account-linking/react.ts
@@ -0,0 +1,19 @@
+export type {
+  CITADEL_NETWORK,
+  CitadelLinkAccountPayload,
+  IUseLinkAccount,
+  IUseSwitchAccount,
+  IUseWallets,
+  LinkAccountParams,
+  LinkAccountResult,
+  LinkedAccountInfo,
+  UnlinkAccountPayload,
+  UnlinkAccountResult,
+} from "@web3auth/no-modal/account-linking/react";
+export {
+  makeAccountLinkingRequest,
+  makeAccountUnlinkingRequest,
+  useLinkAccount,
+  useSwitchAccount,
+  useWallets,
+} from "@web3auth/no-modal/account-linking/react";
diff --git a/packages/modal/src/account-linking/vue.ts b/packages/modal/src/account-linking/vue.ts
new file mode 100644
index 000000000..75de02d24
--- /dev/null
+++ b/packages/modal/src/account-linking/vue.ts
@@ -0,0 +1,19 @@
+export type {
+  CITADEL_NETWORK,
+  CitadelLinkAccountPayload,
+  IUseLinkAccount,
+  IUseSwitchAccount,
+  IUseWallets,
+  LinkAccountParams,
+  LinkAccountResult,
+  LinkedAccountInfo,
+  UnlinkAccountPayload,
+  UnlinkAccountResult,
+} from "@web3auth/no-modal/account-linking/vue";
+export {
+  makeAccountLinkingRequest,
+  makeAccountUnlinkingRequest,
+  useLinkAccount,
+  useSwitchAccount,
+  useWallets,
+} from "@web3auth/no-modal/account-linking/vue";
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
index baa7858ca..261469a74 100644
--- a/packages/modal/src/modalManager.ts
+++ b/packages/modal/src/modalManager.ts
@@ -1,13 +1,16 @@
 import { AuthConnectionConfigItem, serializeError } from "@web3auth/auth";
 import {
+  AccountLinkingError,
   ANALYTICS_EVENTS,
   ANALYTICS_SDK_TYPE,
   type AUTH_CONNECTION_TYPE,
+  AuthConnectorSwitchAccountResult,
   type AuthConnectorType,
   type AuthLoginParams,
   type BaseConnectorConfig,
   type ChainNamespaceType,
   cloneDeep,
+  type CONNECTED_EVENT_DATA,
   CONNECTED_STATUSES,
   type Connection,
   CONNECTOR_CATEGORY,
@@ -21,8 +24,12 @@ import {
   fetchWalletRegistry,
   getErrorAnalyticsProperties,
   type IConnector,
+  type IConnectorDataEvent,
   type IWeb3AuthCoreOptions,
   IWeb3AuthState,
+  type LinkAccountParams,
+  type LinkAccountResult,
+  type LinkedAccountInfo,
   log,
   LOGIN_MODE,
   type LoginMethodConfig,
@@ -32,8 +39,11 @@ import {
   type WALLET_CONNECTOR_TYPE,
   WALLET_CONNECTORS,
   WALLET_REGISTRY_URL,
+  type WalletConnectV2Data,
   WalletInitializationError,
+  WalletLoginError,
   type WalletRegistry,
+  Web3AuthError,
   Web3AuthNoModal,
   withAbort,
 } from "@web3auth/no-modal";
@@ -41,7 +51,18 @@ import deepmerge from "deepmerge";
 
 import { defaultConnectorsModalConfig } from "./config";
 import { type ConnectorsModalConfig, type IWeb3AuthModal, type ModalConfig } from "./interface";
-import { AUTH_PROVIDERS, AUTH_PROVIDERS_NAMES, capitalizeFirstLetter, getUserLanguage, LOGIN_MODAL_EVENTS, LoginModal, type UIConfig } from "./ui";
+import {
+  ACCOUNT_LINKING_INTENT,
+  ACCOUNT_LINKING_STATUS,
+  type AccountLinkingState,
+  AUTH_PROVIDERS,
+  AUTH_PROVIDERS_NAMES,
+  capitalizeFirstLetter,
+  getUserLanguage,
+  LOGIN_MODAL_EVENTS,
+  LoginModal,
+  type UIConfig,
+} from "./ui";
 
 export interface Web3AuthOptions extends IWeb3AuthCoreOptions {
   /**
@@ -64,6 +85,10 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
   private modalConfig: ConnectorsModalConfig = cloneDeep(defaultConnectorsModalConfig);
 
+  private removeAccountLinkingConnectorListeners: (() => void) | null = null;
+
+  private removeAccountLinkingResetOnCloseListener: (() => void) | null = null;
+
   constructor(options: Web3AuthOptions, initialState?: Partial<IWeb3AuthState>) {
     super(options, initialState);
     this.options = { ...options };
@@ -190,7 +215,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
   public async connect(): Promise<Connection | null> {
     if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
     // if already connected return connection
-    if (this.connectedConnectorName && CONNECTED_STATUSES.includes(this.status) && this.connection) return this.connection;
+    if (CONNECTED_STATUSES.includes(this.status) && this.connection) return this.connection;
     this.loginModal.open();
     return new Promise((resolve, reject) => {
       // remove all listeners when promise is resolved or rejected.
@@ -241,6 +266,136 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     await super.completeConsentAcceptance();
   }
 
+  public async switchAccount(account: LinkedAccountInfo): Promise<void> {
+    const authConnector = this.getMainAuthConnector();
+    const switchResult = await authConnector.switchAccount(account, {
+      activeAccount: this.activeAccount,
+      currentChainId: this.currentChainId,
+    });
+    if (!switchResult) {
+      return;
+    }
+
+    try {
+      const existingConnector = switchResult.kind === "external" ? this.getConnectedWalletConnector(switchResult.targetAccount) : null;
+      // check if the existing connector is connected and usable, then we can switch to it without re-connecting again
+      const isExistingConnectorConnected = Boolean(existingConnector && this.hasUsableConnectedSwitchConnector(existingConnector));
+      const projectConfig =
+        switchResult.kind === "external" && !isExistingConnectorConnected ? (await this.getProjectAndWalletConfig())?.projectConfig : undefined;
+
+      if (switchResult.kind !== "external" || isExistingConnectorConnected) {
+        await super.processSwitchAccountResult(authConnector, switchResult, {
+          walletConnector: isExistingConnectorConnected && existingConnector ? existingConnector : undefined,
+          projectConfig,
+        });
+        await authConnector.trackSwitchAccountCompleted(switchResult.targetAccount);
+        return;
+      }
+
+      const connectorToSwitchTo = await this.prepareAccountSwitchConnector(
+        switchResult.targetAccount.connector,
+        switchResult.activeChainId,
+        projectConfig
+      );
+
+      if (connectorToSwitchTo.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
+        await super.processSwitchAccountResult(authConnector, switchResult, {
+          walletConnector: connectorToSwitchTo,
+          projectConfig,
+        });
+        await authConnector.trackSwitchAccountCompleted(switchResult.targetAccount);
+        return;
+      }
+
+      await this.switchToWalletConnectV2Account(switchResult, connectorToSwitchTo, projectConfig);
+    } catch (error) {
+      await authConnector.trackSwitchAccountFailed(switchResult.targetAccount, error);
+      throw error;
+    }
+  }
+
+  public async linkAccount(params: LinkAccountParams): Promise<LinkAccountResult> {
+    const chainId = this.resolveLinkAccountChainId(params.chainId);
+    const connectorToLink = await this.prepareAccountLinkingConnector(params.connectorName, chainId);
+
+    if (connectorToLink.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
+      return super.linkAccountWithConnector(params.connectorName, chainId, connectorToLink);
+    }
+
+    return this.runWalletConnectV2AccountAction({
+      connector: connectorToLink,
+      connectParams: { chainId, isAccountLinking: true },
+      onConnected: async (connector) => ({
+        result: await super.linkAccountWithConnector(params.connectorName, chainId, connector),
+      }),
+      intent: ACCOUNT_LINKING_INTENT.LINK,
+    });
+  }
+
+  protected startAccountLinkingModalSession(params: {
+    connectorName: WALLET_CONNECTOR_TYPE | string;
+    transportConnectorName?: WALLET_CONNECTOR_TYPE | string;
+    chainId: string;
+    intent: (typeof ACCOUNT_LINKING_INTENT)[keyof typeof ACCOUNT_LINKING_INTENT];
+  }): void {
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    this.loginModal.startAccountLinkingSession(params);
+  }
+
+  protected updateAccountLinkingModalSession(accountLinking: Partial<AccountLinkingState>): void {
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    this.loginModal.updateAccountLinkingState(accountLinking);
+  }
+
+  protected resetAccountLinkingModalSession(): void {
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    this.loginModal.resetAccountLinkingSession();
+  }
+
+  protected async prepareAccountLinkingConnector(connectorName: WALLET_CONNECTOR_TYPE | string, chainId: string): Promise<IConnector<unknown>> {
+    const { projectConfig } = await this.getProjectAndWalletConfig();
+    const connector = await super.createLinkingWalletConnector(connectorName, chainId, projectConfig);
+    if (connector.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
+      return connector;
+    }
+
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    this.clearAccountLinkingConnectorListeners();
+    this.removeAccountLinkingConnectorListeners = this.subscribeToAccountLinkingConnectorEvents(connector);
+    this.startAccountLinkingModalSession({
+      connectorName,
+      transportConnectorName: connector.name,
+      chainId,
+      intent: ACCOUNT_LINKING_INTENT.LINK,
+    });
+    this.loginModal.open();
+    return connector;
+  }
+
+  protected async prepareAccountSwitchConnector(
+    connectorName: WALLET_CONNECTOR_TYPE | string,
+    chainId: string,
+    projectConfig?: ProjectConfig
+  ): Promise<IConnector<unknown>> {
+    const finalProjectConfig = projectConfig ?? (await this.getProjectAndWalletConfig()).projectConfig;
+    const connector = await super.createSwitchingWalletConnector(connectorName, chainId, finalProjectConfig);
+    if (connector.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
+      return connector;
+    }
+
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    this.clearAccountLinkingConnectorListeners();
+    this.removeAccountLinkingConnectorListeners = this.subscribeToAccountLinkingConnectorEvents(connector);
+    this.startAccountLinkingModalSession({
+      connectorName,
+      transportConnectorName: connector.name,
+      chainId,
+      intent: ACCOUNT_LINKING_INTENT.SWITCH,
+    });
+    this.loginModal.open();
+    return connector;
+  }
+
   protected initUIConfig(projectConfig: ProjectConfig) {
     super.initUIConfig(projectConfig);
     this.options.uiConfig = deepmerge(cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
@@ -598,7 +753,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
       // initialize connectors
       // skip initializing cached connector here as it is already being initialized in initModal before.
-      if (connector.status === CONNECTOR_STATUS.NOT_READY && this.cachedConnector !== connectorName) {
+      if (
+        connector.status === CONNECTOR_STATUS.NOT_READY &&
+        this.cachedConnector !== connectorName &&
+        this.connection?.connectorName !== connectorName
+      ) {
         try {
           this.subscribeToConnectorEvents(connector);
           const initialChain = this.getInitialChainIdForConnector(connector);
@@ -681,6 +840,10 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     log.debug("is login modal visible", visibility);
     this.emit(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, visibility);
 
+    if (this.loginModal?.hasActiveAccountLinkingSession()) {
+      return;
+    }
+
     // handle WC session refresh
     const wcConnector = this.getConnector(WALLET_CONNECTORS.WALLET_CONNECT_V2);
     if (wcConnector) {
@@ -739,6 +902,201 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     return [...new Set(this.coreOptions.chains?.map((x) => x.chainNamespace) || [])];
   };
 
+  private async switchToWalletConnectV2Account(
+    switchResult: AuthConnectorSwitchAccountResult,
+    connectorToSwitchTo: IConnector<unknown>,
+    projectConfig?: ProjectConfig
+  ) {
+    const authConnector = this.getMainAuthConnector();
+    try {
+      await this.runWalletConnectV2AccountAction({
+        connector: connectorToSwitchTo,
+        connectParams: { chainId: switchResult.activeChainId },
+        onConnected: async (connector) => {
+          await super.processSwitchAccountResult(authConnector, switchResult, {
+            walletConnector: connector,
+            projectConfig,
+          });
+          await authConnector.trackSwitchAccountCompleted(switchResult.targetAccount);
+          return { result: undefined, retainConnector: true };
+        },
+        intent: ACCOUNT_LINKING_INTENT.SWITCH,
+      });
+    } catch (error) {
+      await authConnector.trackSwitchAccountFailed(switchResult.targetAccount, error);
+      this.updateAccountLinkingModalSession({
+        status: ACCOUNT_LINKING_STATUS.ERRORED,
+        errorMessage: (error as Error)?.message || "Failed to switch wallet.",
+      });
+      throw error;
+    }
+  }
+
+  private async runWalletConnectV2AccountAction<T>(params: {
+    connector: IConnector<unknown>;
+    connectParams: { chainId: string; isAccountLinking?: boolean };
+    onConnected: (connector: IConnector<unknown>, connection: Connection) => Promise<{ result: T; retainConnector?: boolean }>;
+    intent: (typeof ACCOUNT_LINKING_INTENT)[keyof typeof ACCOUNT_LINKING_INTENT];
+  }): Promise<T> {
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+
+    this.clearAccountLinkingResetOnCloseListener();
+    let retainConnector = false;
+    let connectCancelled = false;
+    let removeConnectPhaseVisibilityListener = () => {};
+
+    const closeDuringConnectPromise = new Promise<never>((_resolve, reject) => {
+      const handleVisibility = (visibility: boolean) => {
+        if (!visibility) {
+          connectCancelled = true;
+          reject(WalletLoginError.popupClosed("User closed the modal"));
+        }
+      };
+
+      this.on(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
+      removeConnectPhaseVisibilityListener = () => {
+        this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
+      };
+    });
+
+    const connector = params.connector;
+    const connectPromise = connector.connect(params.connectParams);
+    void connectPromise
+      .then(async (connection): Promise<void> => {
+        if (!connectCancelled || !connection || !connector.connected || retainConnector) return undefined;
+        try {
+          await connector.disconnect({ cleanup: true });
+        } catch (error) {
+          log.debug("Failed to disconnect cancelled WalletConnect connector during cleanup", error);
+        }
+        return undefined;
+      })
+      .catch(() => {});
+
+    try {
+      const connection = await Promise.race([connectPromise, closeDuringConnectPromise]);
+      if (!connection) {
+        throw AccountLinkingError.requestFailed("Failed to connect wallet.");
+      }
+
+      removeConnectPhaseVisibilityListener();
+      this.updateAccountLinkingModalSession({
+        status: ACCOUNT_LINKING_STATUS.LINKING,
+        intent: params.intent,
+        walletConnectUri: "",
+        errorMessage: "",
+      });
+
+      const { result, retainConnector: shouldRetainConnector = false } = await params.onConnected(connector, connection);
+      retainConnector = shouldRetainConnector;
+
+      this.updateAccountLinkingModalSession({
+        status: ACCOUNT_LINKING_STATUS.COMPLETED,
+        intent: params.intent,
+        walletConnectUri: "",
+        errorMessage: "",
+      });
+      this.loginModal.closeModal();
+      this.resetAccountLinkingModalSession();
+      return result;
+    } catch (error) {
+      const isPopupClosed = error instanceof Web3AuthError && error.code === 5114;
+
+      if (isPopupClosed) {
+        this.resetAccountLinkingModalSession();
+      }
+
+      this.installAccountLinkingResetOnCloseListener();
+      throw error;
+    } finally {
+      removeConnectPhaseVisibilityListener();
+      this.clearAccountLinkingConnectorListeners();
+      try {
+        if (!retainConnector && connector.connected) {
+          await connector.disconnect({ cleanup: true });
+        }
+      } catch (error) {
+        log.debug("Failed to disconnect WalletConnect connector during cleanup", error);
+      }
+    }
+  }
+
+  private subscribeToAccountLinkingConnectorEvents(connector: IConnector<unknown>): () => void {
+    const handleConnecting = () => {
+      this.updateAccountLinkingModalSession({
+        status: ACCOUNT_LINKING_STATUS.AWAITING_CONNECTION,
+        errorMessage: "",
+      });
+    };
+
+    const handleConnectorDataUpdated = (connectorData: IConnectorDataEvent) => {
+      if (connectorData.connectorName !== WALLET_CONNECTORS.WALLET_CONNECT_V2) return;
+      const walletConnectData = connectorData.data as WalletConnectV2Data;
+      if (!walletConnectData.uri) return;
+      this.updateAccountLinkingModalSession({
+        walletConnectUri: walletConnectData.uri,
+        status: ACCOUNT_LINKING_STATUS.AWAITING_CONNECTION,
+        errorMessage: "",
+      });
+    };
+
+    const handleConnected = (_data: CONNECTED_EVENT_DATA) => {
+      this.updateAccountLinkingModalSession({
+        status: ACCOUNT_LINKING_STATUS.WALLET_CONNECTED,
+        walletConnectUri: "",
+        errorMessage: "",
+      });
+    };
+
+    const handleErrored = (error: Web3AuthError) => {
+      this.updateAccountLinkingModalSession({
+        status: ACCOUNT_LINKING_STATUS.ERRORED,
+        errorMessage: error.message || "Failed to connect wallet.",
+      });
+    };
+
+    connector.on(CONNECTOR_EVENTS.CONNECTING, handleConnecting);
+    connector.on(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, handleConnectorDataUpdated);
+    connector.on(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+    connector.on(CONNECTOR_EVENTS.ERRORED, handleErrored);
+
+    return () => {
+      connector.removeListener(CONNECTOR_EVENTS.CONNECTING, handleConnecting);
+      connector.removeListener(CONNECTOR_EVENTS.CONNECTOR_DATA_UPDATED, handleConnectorDataUpdated);
+      connector.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+      connector.removeListener(CONNECTOR_EVENTS.ERRORED, handleErrored);
+    };
+  }
+
+  private clearAccountLinkingConnectorListeners(): void {
+    if (this.removeAccountLinkingConnectorListeners) {
+      this.removeAccountLinkingConnectorListeners();
+      this.removeAccountLinkingConnectorListeners = null;
+    }
+  }
+
+  private installAccountLinkingResetOnCloseListener(): void {
+    this.clearAccountLinkingResetOnCloseListener();
+
+    const handleVisibility = (visibility: boolean) => {
+      if (visibility) return;
+      this.resetAccountLinkingModalSession();
+      this.clearAccountLinkingResetOnCloseListener();
+    };
+
+    this.on(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
+    this.removeAccountLinkingResetOnCloseListener = () => {
+      this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
+    };
+  }
+
+  private clearAccountLinkingResetOnCloseListener(): void {
+    if (this.removeAccountLinkingResetOnCloseListener) {
+      this.removeAccountLinkingResetOnCloseListener();
+      this.removeAccountLinkingResetOnCloseListener = null;
+    }
+  }
+
   private getCombinedConnectionId(authConnectionId: string, groupedAuthConnectionId: string): string {
     let id = authConnectionId;
     if (groupedAuthConnectionId) {
diff --git a/packages/modal/src/react/wagmi/provider.ts b/packages/modal/src/react/wagmi/provider.ts
index 7755bd18e..a72ee7785 100644
--- a/packages/modal/src/react/wagmi/provider.ts
+++ b/packages/modal/src/react/wagmi/provider.ts
@@ -1,5 +1,5 @@
 import { CHAIN_NAMESPACES, type CustomChainConfig, log, WalletInitializationError } from "@web3auth/no-modal";
-import { createElement, Fragment, PropsWithChildren, useEffect, useMemo } from "react";
+import { createElement, Fragment, PropsWithChildren, useEffect, useMemo, useRef } from "react";
 import { type Chain, defineChain, http, webSocket } from "viem";
 import {
   Config,
@@ -101,6 +101,7 @@ function Web3AuthWagmiProvider({ children }: PropsWithChildren) {
   const { disconnect } = useWeb3AuthDisconnect();
   const wagmiConfig = useWagmiConfig();
   const { mutate: reconnect } = useReconnect();
+  const lastSyncedWeb3AuthConnection = useRef<unknown>(null);
 
   useConnectionEffect({
     onDisconnect: async () => {
@@ -118,16 +119,27 @@ function Web3AuthWagmiProvider({ children }: PropsWithChildren) {
 
   useEffect(() => {
     (async () => {
-      if (isConnected && connection?.ethereumProvider) {
-        const connector = await setupConnector(connection.ethereumProvider, wagmiConfig);
-        if (!connector) {
-          log.error("Failed to setup react wagmi connector");
-          throw new Error("Failed to setup connector");
+      const newConnection = connection ?? null;
+      const newEth = connection?.ethereumProvider ?? null;
+      if (isConnected && newConnection && newEth) {
+        // `ethereumProvider` is a stable proxy (`commonJRPCProvider`) across account switches,
+        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+        if (lastSyncedWeb3AuthConnection.current !== newConnection) {
+          if (getWeb3authConnector(wagmiConfig)) {
+            resetConnectorState(wagmiConfig);
+          }
+          lastSyncedWeb3AuthConnection.current = newConnection;
+          const connector = await setupConnector(newEth, wagmiConfig);
+          if (!connector) {
+            log.error("Failed to setup react wagmi connector");
+            throw new Error("Failed to setup connector");
+          }
+
+          await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+          reconnect();
         }
-
-        await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-        reconnect();
       } else if (!isConnected) {
+        lastSyncedWeb3AuthConnection.current = null;
         if (wagmiConfig.state.status === "connected") {
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
         }
diff --git a/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx b/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx
new file mode 100644
index 000000000..43a5a3c98
--- /dev/null
+++ b/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx
@@ -0,0 +1,113 @@
+import { WALLET_CONNECTORS } from "@web3auth/no-modal";
+import { useMemo } from "react";
+
+import { WALLET_CONNECT_LOGO } from "../../constants";
+import { useModalState } from "../../context/ModalStateContext";
+import { useWidget } from "../../context/WidgetContext";
+import { ACCOUNT_LINKING_INTENT, ACCOUNT_LINKING_STATUS, type ExternalButton } from "../../interfaces";
+import ConnectWalletQrCode from "../ConnectWallet/ConnectWalletQrCode";
+
+interface AccountLinkingProps {
+  allExternalWallets: ExternalButton[];
+}
+
+const DEFAULT_ACCOUNT_LINKING_BUTTON: ExternalButton = {
+  name: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+  displayName: "WalletConnect",
+  hasInjectedWallet: false,
+  hasWalletConnect: true,
+  hasInstallLinks: false,
+  imgExtension: "svg",
+};
+
+function AccountLinking(props: AccountLinkingProps) {
+  const { allExternalWallets } = props;
+
+  const { modalState } = useModalState();
+  const { deviceDetails, isDark } = useWidget();
+
+  const accountLinkingButton = useMemo<ExternalButton>(() => {
+    const requestedConnectorName = modalState.accountLinking.connectorName;
+    if (!requestedConnectorName) return DEFAULT_ACCOUNT_LINKING_BUTTON;
+    return allExternalWallets.find((button) => button.name === requestedConnectorName) || DEFAULT_ACCOUNT_LINKING_BUTTON;
+  }, [allExternalWallets, modalState.accountLinking.connectorName]);
+
+  const accountLinkingDisplayName = useMemo(() => {
+    return accountLinkingButton.displayName || "WalletConnect";
+  }, [accountLinkingButton.displayName]);
+
+  const accountLinkingQrLogoImage = useMemo(() => {
+    if (accountLinkingButton.name === WALLET_CONNECTORS.WALLET_CONNECT_V2 || !accountLinkingButton.imgExtension) {
+      return WALLET_CONNECT_LOGO;
+    }
+    return `https://images.web3auth.io/login-${accountLinkingButton.name}.${accountLinkingButton.imgExtension}`;
+  }, [accountLinkingButton.imgExtension, accountLinkingButton.name]);
+
+  const isSwitchAccountIntent = modalState.accountLinking.intent === ACCOUNT_LINKING_INTENT.SWITCH;
+
+  const accountLinkingMessage = useMemo(() => {
+    switch (modalState.accountLinking.status) {
+      case ACCOUNT_LINKING_STATUS.INITIALIZING:
+        return accountLinkingButton.name === WALLET_CONNECTORS.WALLET_CONNECT_V2
+          ? "Initializing WalletConnect..."
+          : `Initializing ${accountLinkingDisplayName}...`;
+      case ACCOUNT_LINKING_STATUS.AWAITING_CONNECTION:
+        return modalState.accountLinking.walletConnectUri
+          ? accountLinkingButton.name === WALLET_CONNECTORS.WALLET_CONNECT_V2
+            ? "Scan the QR code with a WalletConnect-compatible wallet."
+            : `Scan the QR code with ${accountLinkingDisplayName}.`
+          : accountLinkingButton.name === WALLET_CONNECTORS.WALLET_CONNECT_V2
+            ? "Preparing WalletConnect QR code..."
+            : `Preparing ${accountLinkingDisplayName} QR code...`;
+      case ACCOUNT_LINKING_STATUS.WALLET_CONNECTED:
+        return isSwitchAccountIntent ? "Wallet connected. Preparing account switch..." : "Wallet connected. Preparing account linking...";
+      case ACCOUNT_LINKING_STATUS.LINKING:
+        return isSwitchAccountIntent ? "Switching wallet..." : "Linking wallet...";
+      case ACCOUNT_LINKING_STATUS.COMPLETED:
+        return isSwitchAccountIntent ? "Wallet switched." : "Wallet linked.";
+      case ACCOUNT_LINKING_STATUS.ERRORED:
+        return (
+          modalState.accountLinking.errorMessage ||
+          (isSwitchAccountIntent
+            ? `Failed to switch wallet with ${accountLinkingDisplayName}.`
+            : `Failed to connect with ${accountLinkingDisplayName}.`)
+        );
+      default:
+        return "";
+    }
+  }, [
+    accountLinkingButton.name,
+    accountLinkingDisplayName,
+    isSwitchAccountIntent,
+    modalState.accountLinking.errorMessage,
+    modalState.accountLinking.status,
+    modalState.accountLinking.walletConnectUri,
+  ]);
+
+  return (
+    <div className="w3a--flex w3a--flex-1 w3a--flex-col w3a--gap-y-4">
+      <div className="w3a--flex w3a--items-center w3a--justify-center">
+        <p className="w3a--text-base w3a--font-medium w3a--text-app-gray-900 dark:w3a--text-app-white">{accountLinkingDisplayName}</p>
+      </div>
+      {modalState.accountLinking.status === ACCOUNT_LINKING_STATUS.ERRORED ? (
+        <div className="w3a--rounded-2xl w3a--border w3a--border-app-gray-200 w3a--bg-app-gray-50 w3a--p-4 dark:w3a--border-app-gray-700 dark:w3a--bg-app-gray-800">
+          <p className="w3a--text-center w3a--text-sm w3a--text-app-gray-700 dark:w3a--text-app-gray-200">{accountLinkingMessage}</p>
+        </div>
+      ) : (
+        <ConnectWalletQrCode
+          qrCodeValue={modalState.accountLinking.walletConnectUri}
+          isDark={isDark}
+          selectedButton={accountLinkingButton}
+          logoImage={accountLinkingQrLogoImage}
+          primaryColor={accountLinkingButton.walletRegistryItem?.primaryColor}
+          platform={deviceDetails.platform}
+        />
+      )}
+      {accountLinkingMessage && modalState.accountLinking.status !== ACCOUNT_LINKING_STATUS.ERRORED && (
+        <p className="w3a--text-center w3a--text-sm w3a--text-app-gray-500 dark:w3a--text-app-gray-300">{accountLinkingMessage}</p>
+      )}
+    </div>
+  );
+}
+
+export default AccountLinking;
diff --git a/packages/modal/src/ui/containers/AccountLinking/index.ts b/packages/modal/src/ui/containers/AccountLinking/index.ts
new file mode 100644
index 000000000..ff3293b2a
--- /dev/null
+++ b/packages/modal/src/ui/containers/AccountLinking/index.ts
@@ -0,0 +1 @@
+export { default } from "./AccountLinking";
diff --git a/packages/modal/src/ui/containers/Root/Root.tsx b/packages/modal/src/ui/containers/Root/Root.tsx
index 895b6be70..a8afe5998 100644
--- a/packages/modal/src/ui/containers/Root/Root.tsx
+++ b/packages/modal/src/ui/containers/Root/Root.tsx
@@ -9,10 +9,11 @@ import { DEFAULT_METAMASK_WALLET_REGISTRY_ITEM, PAGES } from "../../constants";
 import { useModalState } from "../../context/ModalStateContext";
 import { RootProvider } from "../../context/RootContext";
 import { useWidget } from "../../context/WidgetContext";
-import { ExternalButton, MODAL_STATUS } from "../../interfaces";
+import { type ExternalButton, MODAL_STATUS } from "../../interfaces";
+import AccountLinking from "../AccountLinking";
 import ConnectWallet from "../ConnectWallet";
 import Login from "../Login";
-import { RootProps } from "./Root.type";
+import type { RootProps } from "./Root.type";
 import RootBodySheets from "./RootBodySheets/RootBodySheets";
 
 function RootContent(props: RootProps) {
@@ -185,9 +186,13 @@ function RootContent(props: RootProps) {
     return !showPasswordLessInput && !areSocialLoginsVisible;
   }, [areSocialLoginsVisible, showPasswordLessInput]);
 
+  const isWalletConnectAccountLinkingVisible = useMemo(() => {
+    return modalState.accountLinking.active && modalState.accountLinking.transportConnectorName === WALLET_CONNECTORS.WALLET_CONNECT_V2;
+  }, [modalState.accountLinking.active, modalState.accountLinking.transportConnectorName]);
+
   const isShowLoader = useMemo(() => {
-    return modalState.status !== MODAL_STATUS.INITIALIZED;
-  }, [modalState.status]);
+    return !isWalletConnectAccountLinkingVisible && modalState.status !== MODAL_STATUS.INITIALIZED;
+  }, [isWalletConnectAccountLinkingVisible, modalState.status]);
 
   const isConsentRequiringStatus = modalState.status === MODAL_STATUS.CONSENT_REQUIRING;
 
@@ -225,16 +230,21 @@ function RootContent(props: RootProps) {
             />
           ) : (
             <>
+              {isWalletConnectAccountLinkingVisible && <AccountLinking allExternalWallets={allExternalWallets} />}
               {/* Login Screen */}
-              {modalState.currentPage === PAGES.LOGIN_OPTIONS && shouldShowLoginPage && modalState.status === MODAL_STATUS.INITIALIZED && (
-                <Login
-                  installedExternalWalletConfig={topInstalledConnectorButtons}
-                  totalExternalWallets={allExternalWallets.length}
-                  remainingUndisplayedWallets={remainingUndisplayedWallets}
-                />
-              )}
+              {!isWalletConnectAccountLinkingVisible &&
+                modalState.currentPage === PAGES.LOGIN_OPTIONS &&
+                shouldShowLoginPage &&
+                modalState.status === MODAL_STATUS.INITIALIZED && (
+                  <Login
+                    installedExternalWalletConfig={topInstalledConnectorButtons}
+                    totalExternalWallets={allExternalWallets.length}
+                    remainingUndisplayedWallets={remainingUndisplayedWallets}
+                  />
+                )}
               {/* Connect Wallet Screen */}
-              {modalState.currentPage === PAGES.WALLET_LIST &&
+              {!isWalletConnectAccountLinkingVisible &&
+                modalState.currentPage === PAGES.WALLET_LIST &&
                 (!shouldShowLoginPage || isExternalWalletModeOnly) &&
                 modalState.status === MODAL_STATUS.INITIALIZED && (
                   <ConnectWallet
diff --git a/packages/modal/src/ui/containers/Widget/Widget.tsx b/packages/modal/src/ui/containers/Widget/Widget.tsx
index e049c3495..251f5d982 100644
--- a/packages/modal/src/ui/containers/Widget/Widget.tsx
+++ b/packages/modal/src/ui/containers/Widget/Widget.tsx
@@ -61,8 +61,11 @@ function WidgetContent() {
   }, [modalState.status]);
 
   useEffect(() => {
-    // TODO: maybe move this inside root
+    // Prewarm WalletConnect for the regular connect flow so mobile users get a QR URI
+    // as soon as the modal opens. Skip this during account linking because that flow
+    // owns its own WalletConnect session and stores its URI in `accountLinking.walletConnectUri`.
     if (!modalState.modalVisibility) return;
+    if (modalState.accountLinking.active) return;
     if (typeof modalState.externalWalletsConfig === "object") {
       // auto connect to WC if not injected to generate QR code URI for mobile connection
       const wcAvailable = (modalState.externalWalletsConfig[WALLET_CONNECTORS.WALLET_CONNECT_V2]?.showOnModal || false) !== false;
diff --git a/packages/modal/src/ui/context/ModalStateContext.tsx b/packages/modal/src/ui/context/ModalStateContext.tsx
index b703a234b..aa1dcb215 100644
--- a/packages/modal/src/ui/context/ModalStateContext.tsx
+++ b/packages/modal/src/ui/context/ModalStateContext.tsx
@@ -15,7 +15,14 @@ import {
 } from "react";
 
 import { PAGES } from "../constants";
-import { type ExternalWalletEventType, MODAL_STATUS, ModalState, type SocialLoginEventType, StateEmitterEvents } from "../interfaces";
+import {
+  DEFAULT_ACCOUNT_LINKING_STATE,
+  type ExternalWalletEventType,
+  MODAL_STATUS,
+  ModalState,
+  type SocialLoginEventType,
+  StateEmitterEvents,
+} from "../interfaces";
 import { useWidget } from "./WidgetContext";
 
 type StateListener = {
@@ -62,6 +69,7 @@ const initialModalState: ModalState = {
   showExternalWalletsOnly: false,
   walletConnectUri: "",
   metamaskConnectUri: "",
+  accountLinking: DEFAULT_ACCOUNT_LINKING_STATE,
 
   // Config State
   socialLoginsConfig: {
diff --git a/packages/modal/src/ui/interfaces.ts b/packages/modal/src/ui/interfaces.ts
index 481c84424..f7775d7b3 100644
--- a/packages/modal/src/ui/interfaces.ts
+++ b/packages/modal/src/ui/interfaces.ts
@@ -128,6 +128,54 @@ export const MODAL_STATUS = {
 } as const;
 export type ModalStatusType = (typeof MODAL_STATUS)[keyof typeof MODAL_STATUS];
 
+export const ACCOUNT_LINKING_STATUS = {
+  IDLE: "idle",
+  INITIALIZING: "initializing",
+  AWAITING_CONNECTION: "awaiting_connection",
+  WALLET_CONNECTED: "wallet_connected",
+  LINKING: "linking",
+  ERRORED: "errored",
+  COMPLETED: "completed",
+} as const;
+export type AccountLinkingStatusType = (typeof ACCOUNT_LINKING_STATUS)[keyof typeof ACCOUNT_LINKING_STATUS];
+
+export const ACCOUNT_LINKING_INTENT = {
+  LINK: "link",
+  SWITCH: "switch",
+} as const;
+export type AccountLinkingIntentType = (typeof ACCOUNT_LINKING_INTENT)[keyof typeof ACCOUNT_LINKING_INTENT];
+
+export interface AccountLinkingState {
+  active: boolean;
+  /**
+   * The name of the wallet to be linked to.
+   */
+  connectorName: WALLET_CONNECTOR_TYPE | string | null;
+  /**
+   * The underlying actual connector that is used to connect to the target account.
+   * This is different from the connectorName coz except for Metamask, others wallet can be used to connect with injectedEvmConnector/solanaStandardWalletConnector if installed.
+   * Otherwise, will fallback to the wallet-connect connector.
+   *
+   * This is useful when we want to rehydrate the linked account, using this transport connector to connect back to the target account.
+   **/
+  transportConnectorName: WALLET_CONNECTOR_TYPE | string | null;
+  chainId: string | null;
+  intent: AccountLinkingIntentType;
+  status: AccountLinkingStatusType;
+  walletConnectUri?: string;
+  errorMessage: string;
+}
+
+export const DEFAULT_ACCOUNT_LINKING_STATE: AccountLinkingState = {
+  active: false,
+  connectorName: null,
+  transportConnectorName: null,
+  chainId: null,
+  intent: ACCOUNT_LINKING_INTENT.LINK,
+  status: ACCOUNT_LINKING_STATUS.IDLE,
+  errorMessage: "",
+};
+
 export interface ModalState {
   // UI State - changes frequently during user interaction
   status: ModalStatusType;
@@ -146,6 +194,7 @@ export interface ModalState {
   showExternalWalletsOnly: boolean;
   walletConnectUri: string;
   metamaskConnectUri: string;
+  accountLinking: AccountLinkingState;
 
   // Config State - set during initialization, rarely changes
   socialLoginsConfig: SocialLoginsConfig;
diff --git a/packages/modal/src/ui/loginModal.tsx b/packages/modal/src/ui/loginModal.tsx
index 4b727b70c..08a945dd3 100644
--- a/packages/modal/src/ui/loginModal.tsx
+++ b/packages/modal/src/ui/loginModal.tsx
@@ -35,7 +35,11 @@ import Widget from "./containers/Widget";
 import { AnalyticsContext } from "./context/AnalyticsContext";
 import { WidgetProvider } from "./context/WidgetContext";
 import {
+  ACCOUNT_LINKING_INTENT,
+  ACCOUNT_LINKING_STATUS,
+  type AccountLinkingState,
   browser,
+  DEFAULT_ACCOUNT_LINKING_STATE,
   ExternalWalletEventType,
   LoginModalCallbacks,
   LoginModalProps,
@@ -84,6 +88,8 @@ export class LoginModal {
 
   private modalStatus: ModalStatusType = MODAL_STATUS.INITIALIZED;
 
+  private accountLinkingState: AccountLinkingState = { ...DEFAULT_ACCOUNT_LINKING_STATE };
+
   constructor(uiConfig: LoginModalProps, callbacks: LoginModalCallbacks) {
     this.uiConfig = uiConfig;
 
@@ -319,6 +325,37 @@ export class LoginModal {
     });
   };
 
+  startAccountLinkingSession = (params: {
+    connectorName: WALLET_CONNECTOR_TYPE | string;
+    transportConnectorName?: WALLET_CONNECTOR_TYPE | string;
+    chainId: string;
+    intent?: (typeof ACCOUNT_LINKING_INTENT)[keyof typeof ACCOUNT_LINKING_INTENT];
+  }): void => {
+    this.updateAccountLinkingState({
+      ...DEFAULT_ACCOUNT_LINKING_STATE,
+      active: true,
+      connectorName: params.connectorName,
+      transportConnectorName: params.transportConnectorName ?? params.connectorName,
+      chainId: params.chainId,
+      intent: params.intent ?? ACCOUNT_LINKING_INTENT.LINK,
+      status: ACCOUNT_LINKING_STATUS.INITIALIZING,
+    });
+  };
+
+  updateAccountLinkingState = (accountLinking: Partial<AccountLinkingState>): void => {
+    this.accountLinkingState = { ...this.accountLinkingState, ...accountLinking };
+    this.setState({ accountLinking: this.accountLinkingState });
+  };
+
+  resetAccountLinkingSession = (): void => {
+    this.accountLinkingState = { ...DEFAULT_ACCOUNT_LINKING_STATE };
+    this.setState({ accountLinking: this.accountLinkingState });
+  };
+
+  hasActiveAccountLinkingSession = (): boolean => {
+    return this.accountLinkingState.active;
+  };
+
   open = () => {
     this.setState({
       modalVisibility: true,
diff --git a/packages/modal/src/vue/wagmi/provider.ts b/packages/modal/src/vue/wagmi/provider.ts
index 484d74181..c29a53c84 100644
--- a/packages/modal/src/vue/wagmi/provider.ts
+++ b/packages/modal/src/vue/wagmi/provider.ts
@@ -94,6 +94,7 @@ const Web3AuthWagmiProvider = defineComponent({
     const { disconnect } = useWeb3AuthDisconnect();
     const wagmiConfig = useWagmiConfig();
     const { mutate: reconnect } = useReconnect();
+    const lastSyncedWeb3AuthConnection = shallowRef<unknown>(null);
 
     useConnectionEffect({
       onDisconnect: async () => {
@@ -113,16 +114,27 @@ const Web3AuthWagmiProvider = defineComponent({
       [isConnected, connection],
       async () => {
         const newIsConnected = isConnected.value;
-        if (newIsConnected && connection.value?.ethereumProvider) {
-          const connector = await setupConnector(connection.value.ethereumProvider, wagmiConfig);
-          if (!connector) {
-            log.error("Failed to setup vue wagmi connector");
-            throw new Error("Failed to setup connector");
+        const newConnection = connection.value;
+        const newEth = newConnection?.ethereumProvider ?? null;
+        if (newIsConnected && newConnection && newEth) {
+          // `ethereumProvider` is a stable proxy (`commonJRPCProvider`) across account switches,
+          // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+          if (lastSyncedWeb3AuthConnection.value !== newConnection) {
+            if (getWeb3authConnector(wagmiConfig)) {
+              resetConnectorState(wagmiConfig);
+            }
+            lastSyncedWeb3AuthConnection.value = newConnection;
+            const connector = await setupConnector(newEth, wagmiConfig);
+            if (!connector) {
+              log.error("Failed to setup vue wagmi connector");
+              throw new Error("Failed to setup connector");
+            }
+
+            await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+            reconnect();
           }
-
-          await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-          reconnect();
         } else if (!newIsConnected) {
+          lastSyncedWeb3AuthConnection.value = null;
           if (wagmiConfig.state.status === "connected") {
             await disconnectWeb3AuthFromWagmi(wagmiConfig);
           }
diff --git a/packages/modal/test/configs/browsers.config.mts b/packages/modal/test/configs/browsers.config.mts
index 6c1c4e40c..6cbb1f54f 100644
--- a/packages/modal/test/configs/browsers.config.mts
+++ b/packages/modal/test/configs/browsers.config.mts
@@ -20,6 +20,7 @@ const modalOptimizeDepsInclude = [
   "@babel/runtime/helpers/objectSpread2",
   "@babel/runtime/helpers/objectWithoutProperties",
   "@hcaptcha/react-hcaptcha",
+  "@paulmillr/qr",
   "bowser",
   "classnames",
   "clsx",
diff --git a/packages/modal/test/modalManager.test.ts b/packages/modal/test/modalManager.test.ts
index 4bd7972d2..678d0e565 100644
--- a/packages/modal/test/modalManager.test.ts
+++ b/packages/modal/test/modalManager.test.ts
@@ -1,15 +1,40 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("@metamask/connect-evm", () => ({
+  createEVMClient: vi.fn(),
+}));
+
+vi.mock("@metamask/connect-multichain", () => ({
+  createMultichainClient: vi.fn(),
+  hasExtension: vi.fn(async () => false),
+}));
+
+vi.mock("@metamask/connect-solana", () => ({
+  createSolanaClient: vi.fn(),
+}));
+
+vi.mock("@paulmillr/qr", () => ({}));
+
+vi.mock("@web3auth/no-modal", async () => {
+  const actual = await vi.importActual<typeof import("../../no-modal/src")>("../../no-modal/src");
+  return actual;
+});
+
 import {
   CHAIN_NAMESPACES,
   CONNECTED_STATUSES,
+  type ConnectedAccountInfo,
+  Connection,
   CONNECTOR_EVENTS,
   CONNECTOR_INITIAL_AUTHENTICATION_MODE,
+  type IConnector,
+  type LinkAccountResult,
   type ProjectConfig,
   WALLET_CONNECTORS,
   WalletInitializationError,
   WalletLoginError,
   Web3AuthNoModal,
 } from "@web3auth/no-modal";
-import { describe, expect, it, vi } from "vitest";
 
 import { Web3Auth, type Web3AuthOptions } from "../src/modalManager";
 import { LOGIN_MODAL_EVENTS } from "../src/ui";
@@ -23,6 +48,14 @@ class TestWeb3Auth extends Web3Auth {
   public exposeGetInitializationTrackData() {
     return this.getInitializationTrackData();
   }
+
+  public exposeSetConnectedWalletConnector(connector: IConnector<unknown>, account?: ConnectedAccountInfo | null) {
+    this.setConnectedWalletConnector(connector, account);
+  }
+
+  public exposeSetActiveWalletConnectorKey(account?: ConnectedAccountInfo | null) {
+    this.setActiveWalletConnectorKey(account);
+  }
 }
 
 function createSdk(overrides: Partial<Web3AuthOptions> = {}) {
@@ -52,7 +85,26 @@ function createSdk(overrides: Partial<Web3AuthOptions> = {}) {
   } as never);
 }
 
+function createConnectedWalletAccount(overrides: Partial<ConnectedAccountInfo> = {}): ConnectedAccountInfo {
+  return {
+    id: "wallet-1",
+    accountType: "external_wallet",
+    address: "0xAbCdEf0123456789aBCdEf0123456789abCDef01",
+    authConnectionId: null,
+    chainNamespace: "evm",
+    isPrimary: false,
+    eoaAddress: "0xAbCdEf0123456789aBCdEf0123456789abCDef01",
+    connector: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+    active: false,
+    ...overrides,
+  };
+}
+
 describe("Web3Auth (modal)", () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
   it("extends Web3AuthNoModal and sets constructor defaults", () => {
     const sdk = createSdk();
     expect(sdk).toBeInstanceOf(Web3AuthNoModal);
@@ -79,22 +131,29 @@ describe("Web3Auth (modal)", () => {
     const open = vi.fn();
     (sdk as unknown as { loginModal: { open: () => void } }).loginModal = { open };
     (sdk as unknown as { state: Record<string, unknown> }).state = {
-      connectedConnectorName: WALLET_CONNECTORS.AUTH,
+      primaryConnectorName: WALLET_CONNECTORS.AUTH,
       cachedConnector: null,
       currentChainId: "0x1",
       idToken: null,
       accessToken: null,
       refreshToken: null,
     };
-    (sdk as unknown as { currentConnection: Record<string, unknown> }).currentConnection = {
+    const currentConnection = {
       ethereumProvider: {},
+      // @ts-expect-error - solanaWallet is not used in this test
       solanaWallet: null,
       connectorName: WALLET_CONNECTORS.AUTH,
     };
+    sdk.exposeSetConnectedWalletConnector({
+      name: WALLET_CONNECTORS.AUTH,
+      connected: true,
+      provider: currentConnection.ethereumProvider,
+      solanaWallet: currentConnection.solanaWallet,
+    } as never);
     sdk.status = CONNECTED_STATUSES[0];
 
     const connection = await sdk.connect();
-    expect(connection).toEqual((sdk as unknown as { currentConnection: Record<string, unknown> }).currentConnection);
+    expect(connection).toEqual(currentConnection);
     expect(open).not.toHaveBeenCalled();
   });
 
@@ -144,12 +203,7 @@ describe("Web3Auth (modal)", () => {
     const promise = sdk.connect();
     expect(open).toHaveBeenCalledOnce();
     sdk.emit(CONNECTOR_EVENTS.CONSENT_ACCEPTED, {
-      connectorName: WALLET_CONNECTORS.AUTH,
-      ethereumProvider: null,
-      solanaWallet: null,
       reconnected: false,
-      loginMode: "modal",
-      pendingUserConsent: false,
     });
     await expect(promise).resolves.toBeNull();
   });
@@ -172,6 +226,218 @@ describe("Web3Auth (modal)", () => {
     await expect(promise).rejects.toThrow("User closed the modal");
   });
 
+  it("switchAccount reuses an already-connected WalletConnect signer without reopening modal", async () => {
+    const sdk = createSdk();
+    const targetAccount = createConnectedWalletAccount();
+    const switchResult = {
+      kind: "external" as const,
+      targetAccount,
+      activeAccount: { ...targetAccount, active: true },
+      activeChainId: "0x1",
+    };
+    const authConnector = {
+      switchAccount: vi.fn().mockResolvedValue(switchResult),
+      trackSwitchAccountCompleted: vi.fn(),
+      trackSwitchAccountFailed: vi.fn(),
+    };
+    const existingConnector = {
+      connected: true,
+      provider: {},
+      solanaWallet: null as unknown as Connection["solanaWallet"],
+      name: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+    };
+
+    const processSwitchAccountResultSpy = vi
+      // @ts-expect-error - processSwitchAccountResult is a protected method of Web3AuthNoModal, we need to mock it for testing
+      .spyOn(Web3AuthNoModal.prototype as Web3AuthNoModal, "processSwitchAccountResult")
+      .mockResolvedValue(undefined);
+    const getProjectAndWalletConfigSpy = vi.spyOn(
+      sdk as unknown as { getProjectAndWalletConfig: () => Promise<unknown> },
+      "getProjectAndWalletConfig"
+    );
+
+    vi.spyOn(sdk as unknown as { getMainAuthConnector: () => unknown }, "getMainAuthConnector").mockReturnValue(authConnector as never);
+    vi.spyOn(
+      sdk as unknown as { getConnectedWalletConnector: (account?: ConnectedAccountInfo | null) => unknown },
+      "getConnectedWalletConnector"
+    ).mockReturnValue(existingConnector as never);
+
+    await sdk.switchAccount(targetAccount);
+
+    expect(getProjectAndWalletConfigSpy).not.toHaveBeenCalled();
+    expect(processSwitchAccountResultSpy).toHaveBeenCalledWith(
+      authConnector,
+      switchResult,
+      expect.objectContaining({ walletConnector: existingConnector })
+    );
+    expect(authConnector.trackSwitchAccountCompleted).toHaveBeenCalledWith(targetAccount);
+  });
+
+  it("switchAccount opens WalletConnect modal flow when phantom resolves to WalletConnect transport", async () => {
+    const sdk = createSdk();
+    const closeModal = vi.fn();
+    const resetAccountLinkingSession = vi.fn();
+    const updateAccountLinkingState = vi.fn();
+    (
+      sdk as unknown as {
+        loginModal: {
+          closeModal: () => void;
+          resetAccountLinkingSession: () => void;
+          updateAccountLinkingState: (state: unknown) => void;
+        };
+      }
+    ).loginModal = {
+      closeModal,
+      resetAccountLinkingSession,
+      updateAccountLinkingState,
+    };
+
+    const targetAccount = createConnectedWalletAccount({ id: "wallet-2", connector: "phantom" });
+    const switchResult = {
+      kind: "external" as const,
+      targetAccount,
+      activeAccount: { ...targetAccount, active: true },
+      activeChainId: "0x1",
+    };
+    const authConnector = {
+      switchAccount: vi.fn().mockResolvedValue(switchResult),
+      trackSwitchAccountCompleted: vi.fn(),
+      trackSwitchAccountFailed: vi.fn(),
+    };
+    const projectConfig = createModalProjectConfig({
+      externalWalletAuth: {} as never,
+    });
+    const connector = {
+      name: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+      connected: false,
+      connect: vi.fn().mockResolvedValue({
+        connectorName: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+        ethereumProvider: {},
+        solanaWallet: null,
+      }),
+      disconnect: vi.fn(),
+      on: vi.fn(),
+      removeListener: vi.fn(),
+    };
+
+    const processSwitchAccountResultSpy = vi
+      // @ts-expect-error - processSwitchAccountResult is a protected method of Web3AuthNoModal, we need to mock it for testing
+      .spyOn(Web3AuthNoModal.prototype as Web3AuthNoModal, "processSwitchAccountResult")
+      .mockResolvedValue(undefined);
+    const getProjectAndWalletConfigSpy = vi.spyOn(
+      sdk as unknown as { getProjectAndWalletConfig: () => Promise<{ projectConfig: ProjectConfig }> },
+      "getProjectAndWalletConfig"
+    );
+    getProjectAndWalletConfigSpy.mockResolvedValue({
+      projectConfig,
+      walletRegistry: createWalletRegistry(),
+    } as never);
+    const prepareAccountSwitchConnectorSpy = vi.spyOn(
+      sdk as unknown as {
+        prepareAccountSwitchConnector: (connectorName: string, chainId: string, config?: ProjectConfig) => Promise<unknown>;
+      },
+      "prepareAccountSwitchConnector"
+    );
+    prepareAccountSwitchConnectorSpy.mockResolvedValue(connector as never);
+
+    vi.spyOn(sdk as unknown as { getMainAuthConnector: () => unknown }, "getMainAuthConnector").mockReturnValue(authConnector as never);
+    vi.spyOn(
+      sdk as unknown as { getConnectedWalletConnector: (account?: ConnectedAccountInfo | null) => unknown },
+      "getConnectedWalletConnector"
+    ).mockReturnValue(null);
+
+    await sdk.switchAccount(targetAccount);
+
+    expect(getProjectAndWalletConfigSpy).toHaveBeenCalledOnce();
+    expect(prepareAccountSwitchConnectorSpy).toHaveBeenCalledWith("phantom", "0x1", projectConfig);
+    expect(connector.connect).toHaveBeenCalledWith({ chainId: "0x1" });
+    expect(processSwitchAccountResultSpy).toHaveBeenCalledWith(
+      authConnector,
+      switchResult,
+      expect.objectContaining({
+        walletConnector: connector,
+        projectConfig,
+      })
+    );
+    expect(closeModal).toHaveBeenCalledOnce();
+    expect(resetAccountLinkingSession).toHaveBeenCalledOnce();
+    expect(updateAccountLinkingState).toHaveBeenCalled();
+    expect(authConnector.trackSwitchAccountCompleted).toHaveBeenCalledWith(targetAccount);
+  });
+
+  it("linkAccount routes phantom through WalletConnect modal flow when the resolved transport is WalletConnect", async () => {
+    const sdk = createSdk();
+    const walletConnectConnector = {
+      name: WALLET_CONNECTORS.WALLET_CONNECT_V2,
+    };
+    const result: LinkAccountResult = {
+      success: true,
+      idToken: "linked-id-token",
+      linkedAccounts: [],
+    };
+
+    const prepareAccountLinkingConnectorSpy = vi.spyOn(
+      sdk as unknown as {
+        prepareAccountLinkingConnector: (connectorName: string, chainId: string) => Promise<unknown>;
+      },
+      "prepareAccountLinkingConnector"
+    );
+    prepareAccountLinkingConnectorSpy.mockResolvedValue(walletConnectConnector as never);
+    const runWalletConnectV2AccountActionSpy = vi.spyOn(
+      sdk as unknown as {
+        runWalletConnectV2AccountAction: (params: unknown) => Promise<LinkAccountResult>;
+      },
+      "runWalletConnectV2AccountAction"
+    );
+    runWalletConnectV2AccountActionSpy.mockResolvedValue(result);
+    // @ts-expect-error - linkAccountWithConnector is a protected method of Web3AuthNoModal
+    const linkAccountWithConnectorSpy = vi.spyOn(Web3AuthNoModal.prototype as Web3AuthNoModal, "linkAccountWithConnector");
+
+    const response = await sdk.linkAccount({ connectorName: "phantom", chainId: "0x1" });
+
+    expect(prepareAccountLinkingConnectorSpy).toHaveBeenCalledWith("phantom", "0x1");
+    expect(runWalletConnectV2AccountActionSpy).toHaveBeenCalledOnce();
+    expect(linkAccountWithConnectorSpy).not.toHaveBeenCalled();
+    expect(response).toEqual(result);
+  });
+
+  it("linkAccount links phantom directly when the resolved transport is installed", async () => {
+    const sdk = createSdk();
+    const phantomConnector = {
+      name: "phantom",
+    };
+    const result: LinkAccountResult = {
+      success: true,
+      idToken: "linked-id-token",
+      linkedAccounts: [],
+    };
+
+    const prepareAccountLinkingConnectorSpy = vi.spyOn(
+      sdk as unknown as {
+        prepareAccountLinkingConnector: (connectorName: string, chainId: string) => Promise<unknown>;
+      },
+      "prepareAccountLinkingConnector"
+    );
+    prepareAccountLinkingConnectorSpy.mockResolvedValue(phantomConnector as never);
+    const runWalletConnectV2AccountActionSpy = vi.spyOn(
+      sdk as unknown as {
+        runWalletConnectV2AccountAction: (params: unknown) => Promise<LinkAccountResult>;
+      },
+      "runWalletConnectV2AccountAction"
+    );
+    // @ts-expect-error - linkAccountWithConnector is a private method of Web3AuthNoModal
+    const linkAccountWithConnectorSpy = vi.spyOn(Web3AuthNoModal.prototype as Web3AuthNoModal, "linkAccountWithConnector");
+    // @ts-expect-error - mock for testing
+    linkAccountWithConnectorSpy.mockResolvedValue(result);
+
+    const response = await sdk.linkAccount({ connectorName: "phantom", chainId: "0x1" });
+
+    expect(prepareAccountLinkingConnectorSpy).toHaveBeenCalledWith("phantom", "0x1");
+    expect(linkAccountWithConnectorSpy).toHaveBeenCalledWith("phantom", "0x1", phantomConnector);
+    expect(runWalletConnectV2AccountActionSpy).not.toHaveBeenCalled();
+    expect(response).toEqual(result);
+  });
+
   it("initUIConfig merges whitelabel + ui config and deduplicates loginMethodsOrder", () => {
     const sdk = createSdk({
       uiConfig: {
diff --git a/packages/no-modal/package.json b/packages/no-modal/package.json
index ff5947fa5..f028d7adb 100644
--- a/packages/no-modal/package.json
+++ b/packages/no-modal/package.json
@@ -118,6 +118,21 @@
       "require": "./dist/lib.cjs/index.js",
       "types": "./dist/lib.cjs/types/index.d.ts"
     },
+    "./account-linking": {
+      "import": "./dist/lib.esm/account-linking/index.js",
+      "require": "./dist/lib.cjs/account-linking/index.js",
+      "types": "./dist/lib.cjs/types/account-linking/index.d.ts"
+    },
+    "./account-linking/react": {
+      "import": "./dist/lib.esm/account-linking/react.js",
+      "require": "./dist/lib.cjs/account-linking/react.js",
+      "types": "./dist/lib.cjs/types/account-linking/react.d.ts"
+    },
+    "./account-linking/vue": {
+      "import": "./dist/lib.esm/account-linking/vue.js",
+      "require": "./dist/lib.cjs/account-linking/vue.js",
+      "types": "./dist/lib.cjs/types/account-linking/vue.d.ts"
+    },
     "./x402": {
       "import": "./dist/lib.esm/x402/index.js",
       "require": "./dist/lib.cjs/x402/index.js",
@@ -176,6 +191,15 @@
   },
   "typesVersions": {
     "*": {
+      "account-linking": [
+        "./dist/lib.cjs/types/account-linking/index.d.ts"
+      ],
+      "account-linking/react": [
+        "./dist/lib.cjs/types/account-linking/react.d.ts"
+      ],
+      "account-linking/vue": [
+        "./dist/lib.cjs/types/account-linking/vue.d.ts"
+      ],
       "x402": [
         "./dist/lib.cjs/types/x402/index.d.ts"
       ],
diff --git a/packages/no-modal/rollup.config.mjs b/packages/no-modal/rollup.config.mjs
index 84bae8e76..359358c7a 100644
--- a/packages/no-modal/rollup.config.mjs
+++ b/packages/no-modal/rollup.config.mjs
@@ -9,6 +9,9 @@ const allDeps = [...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peer
 export const baseConfig = {
   input: [
     "./src/index.ts",
+    "./src/account-linking/index.ts",
+    "./src/account-linking/react.ts",
+    "./src/account-linking/vue.ts",
     "./src/x402/index.ts",
     "./src/x402/react.ts",
     "./src/x402/vue.ts",
diff --git a/packages/no-modal/src/account-linking/index.ts b/packages/no-modal/src/account-linking/index.ts
new file mode 100644
index 000000000..95db5c73f
--- /dev/null
+++ b/packages/no-modal/src/account-linking/index.ts
@@ -0,0 +1,2 @@
+export * from "./interfaces";
+export * from "./rest";
diff --git a/packages/no-modal/src/account-linking/interfaces.ts b/packages/no-modal/src/account-linking/interfaces.ts
new file mode 100644
index 000000000..98336112b
--- /dev/null
+++ b/packages/no-modal/src/account-linking/interfaces.ts
@@ -0,0 +1,106 @@
+import type { WALLET_CONNECTOR_TYPE } from "../base/wallet";
+
+export type CITADEL_NETWORK = "ethereum" | "solana";
+
+export interface LinkAccountParams {
+  /**
+   * Name of the external wallet connector to link.
+   * Example: WALLET_CONNECTORS.METAMASK, WALLET_CONNECTORS.WALLET_CONNECT_V2
+   */
+  connectorName: WALLET_CONNECTOR_TYPE | string;
+
+  /**
+   * Chain ID to use when generating the wallet identity proof.
+   * Defaults to the currently active chain if not specified.
+   */
+  chainId?: string;
+}
+
+/**
+ * Linked account info returned from the Citadel server
+ */
+export interface BaseLinkedAccountInfo {
+  /** Type of the account (e.g. "social", "external_wallet", "account_abstraction") */
+  accountType: string;
+  /** Address of the account */
+  address: string | null;
+  /** Auth connection id of the account */
+  authConnectionId: string | null;
+  /** Grouped auth connection id of the account */
+  groupedAuthConnectionId?: string | null;
+  /** Chain namespace of the account */
+  chainNamespace: string | null;
+}
+
+/**
+ * Result returned after a successful account-linking operation.
+ */
+export interface LinkAccountResult {
+  /** Whether the Citadel server accepted the linking request. */
+  success: boolean;
+
+  /** Refreshed id token for the user */
+  idToken: string;
+
+  /** Linked account info */
+  linkedAccounts: BaseLinkedAccountInfo[];
+
+  /** Error message from the Citadel server */
+  message?: string;
+}
+
+/**
+ * Result returned after a successful account-unlinking operation.
+ */
+export interface UnlinkAccountResult {
+  /** Whether the Citadel server accepted the linking request. */
+  success: boolean;
+
+  /** Refreshed id token for the user */
+  idToken: string;
+
+  /** Remaining linked account info */
+  linkedAccounts: BaseLinkedAccountInfo[];
+
+  /** Error message from the Citadel server */
+  message?: string;
+}
+
+/**
+ * Payload sent to the Citadel account-linking endpoint.
+ */
+export interface CitadelLinkAccountPayload {
+  /** Current idToken to refresh with updated linked accounts */
+  idToken: string;
+
+  /** Network of the account being linked */
+  network: CITADEL_NETWORK;
+
+  /** Name of the connector being linked */
+  connector: string;
+
+  /** Challenge message to be signed by the user */
+  message: string;
+
+  /** Sign In with Web3 signature object */
+  signature: {
+    /** signature value */
+    s: string;
+    /** signature type (e.g. "eip191", "sip99") */
+    t: string;
+  };
+}
+
+/**
+ * Payload sent to the Citadel account-unlinking endpoint.
+ */
+export interface UnlinkAccountPayload {
+  /** Current idToken to refresh with updated linked accounts */
+  idToken: string;
+
+  /** Address of the account to unlink */
+  address: string;
+
+  /** Network of the account being unlinked */
+  network: CITADEL_NETWORK;
+}
diff --git a/packages/no-modal/src/account-linking/react.ts b/packages/no-modal/src/account-linking/react.ts
new file mode 100644
index 000000000..c67cceeea
--- /dev/null
+++ b/packages/no-modal/src/account-linking/react.ts
@@ -0,0 +1,133 @@
+import { useCallback, useState } from "react";
+
+import { type LinkedAccountInfo, WalletInitializationError, Web3AuthError } from "../base";
+import { useWeb3AuthInner } from "../react/hooks/useWeb3AuthInner";
+import { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from "./index";
+import type { BaseLinkedAccountInfo, LinkAccountParams, LinkAccountResult, UnlinkAccountResult } from "./interfaces";
+
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest };
+export type {
+  CITADEL_NETWORK,
+  CitadelLinkAccountPayload,
+  LinkAccountParams,
+  LinkAccountResult,
+  BaseLinkedAccountInfo as LinkedAccountInfo,
+  UnlinkAccountPayload,
+  UnlinkAccountResult,
+} from "./interfaces";
+
+export interface IUseLinkAccount {
+  loading: boolean;
+  error: Web3AuthError | null;
+  linkedAccounts: BaseLinkedAccountInfo[];
+  linkAccount(params: LinkAccountParams): Promise<LinkAccountResult | void>;
+  unlinkAccount(address: string): Promise<UnlinkAccountResult | void>;
+}
+
+export interface IUseSwitchAccount {
+  loading: boolean;
+  error: Web3AuthError | null;
+  switchAccount(account: LinkedAccountInfo): Promise<void>;
+}
+
+export interface IUseWallets {
+  loading: boolean;
+  error: Web3AuthError | null;
+  wallets: LinkedAccountInfo[];
+  getWallets(): Promise<void>;
+}
+
+export const useLinkAccount = (): IUseLinkAccount => {
+  const { web3Auth } = useWeb3AuthInner();
+
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<Web3AuthError | null>(null);
+  const [linkedAccounts, setLinkedAccounts] = useState<BaseLinkedAccountInfo[]>([]);
+
+  const linkAccount = useCallback(
+    async (params: LinkAccountParams): Promise<LinkAccountResult | void> => {
+      if (!web3Auth) throw WalletInitializationError.notReady();
+      setLoading(true);
+      setError(null);
+      try {
+        const result = await web3Auth.linkAccount(params);
+        setLinkedAccounts(result.linkedAccounts);
+        return result;
+      } catch (err) {
+        setError(err as Web3AuthError);
+      } finally {
+        setLoading(false);
+      }
+    },
+    [web3Auth]
+  );
+
+  const unlinkAccount = useCallback(
+    async (address: string): Promise<UnlinkAccountResult | void> => {
+      if (!web3Auth) throw WalletInitializationError.notReady();
+      setLoading(true);
+      setError(null);
+      try {
+        const result = await web3Auth.unlinkAccount(address);
+        setLinkedAccounts(result.linkedAccounts);
+        return result;
+      } catch (err) {
+        setError(err as Web3AuthError);
+      } finally {
+        setLoading(false);
+      }
+    },
+    [web3Auth]
+  );
+
+  return { loading, error, linkAccount, unlinkAccount, linkedAccounts };
+};
+
+export const useSwitchAccount = (): IUseSwitchAccount => {
+  const { web3Auth } = useWeb3AuthInner();
+
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<Web3AuthError | null>(null);
+
+  const switchAccount = useCallback(
+    async (account: LinkedAccountInfo): Promise<void> => {
+      if (!web3Auth) throw WalletInitializationError.notReady();
+      setLoading(true);
+      setError(null);
+      try {
+        await web3Auth.switchAccount(account);
+      } catch (err) {
+        setError(err as Web3AuthError);
+      } finally {
+        setLoading(false);
+      }
+    },
+    [web3Auth]
+  );
+
+  return { loading, error, switchAccount };
+};
+
+export const useWallets = (): IUseWallets => {
+  const { web3Auth } = useWeb3AuthInner();
+
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<Web3AuthError | null>(null);
+  const [wallets, setWallets] = useState<LinkedAccountInfo[]>([]);
+
+  const getWallets = useCallback(async (): Promise<void> => {
+    if (!web3Auth) throw WalletInitializationError.notReady();
+    setLoading(true);
+    setError(null);
+    try {
+      const result = await web3Auth.getLinkedAccounts();
+      setWallets(result);
+    } catch (err) {
+      setError(err as Web3AuthError);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+
+  return { loading, error, wallets, getWallets };
+};
diff --git a/packages/no-modal/src/account-linking/rest.ts b/packages/no-modal/src/account-linking/rest.ts
new file mode 100644
index 000000000..f69bb884e
--- /dev/null
+++ b/packages/no-modal/src/account-linking/rest.ts
@@ -0,0 +1,64 @@
+import { post } from "@toruslabs/http-helpers";
+
+import { AccountLinkingError } from "../base/errors";
+import { CitadelLinkAccountPayload, LinkAccountResult, UnlinkAccountPayload, UnlinkAccountResult } from "./interfaces";
+
+/**
+ * Send both identity proofs to the Citadel account-linking endpoint and
+ * return a normalized result.
+ *
+ * Throws AccountLinkingError when the server returns an error or the request itself fails.
+ */
+export async function makeAccountLinkingRequest(
+  authServerUrl: string,
+  accessToken: string,
+  payload: CitadelLinkAccountPayload
+): Promise<LinkAccountResult> {
+  const url = `${authServerUrl}/v1/link/wallet`;
+  let result: LinkAccountResult;
+
+  try {
+    result = await post<LinkAccountResult>(url, payload, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+  } catch (cause: unknown) {
+    const message = cause instanceof Error ? cause.message : String(cause);
+    throw AccountLinkingError.requestFailed(message, cause);
+  }
+
+  if (!result.success) {
+    const errMessage = result.message ?? "Failed to link account";
+    throw AccountLinkingError.requestFailed(errMessage);
+  }
+
+  return result;
+}
+
+export async function makeAccountUnlinkingRequest(
+  authServerUrl: string,
+  accessToken: string,
+  payload: UnlinkAccountPayload
+): Promise<UnlinkAccountResult> {
+  const url = `${authServerUrl}/v1/unlink`;
+  let result: UnlinkAccountResult;
+
+  try {
+    result = await post<UnlinkAccountResult>(url, payload, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+  } catch (cause: unknown) {
+    const message = cause instanceof Error ? cause.message : String(cause);
+    throw AccountLinkingError.requestFailed(message, cause);
+  }
+
+  if (!result.success) {
+    const errMessage = result.message ?? "Failed to unlink account";
+    throw AccountLinkingError.requestFailed(errMessage);
+  }
+
+  return result;
+}
diff --git a/packages/no-modal/src/account-linking/vue.ts b/packages/no-modal/src/account-linking/vue.ts
new file mode 100644
index 000000000..29d7cebc6
--- /dev/null
+++ b/packages/no-modal/src/account-linking/vue.ts
@@ -0,0 +1,140 @@
+import { Ref, ref } from "vue";
+
+import { type LinkedAccountInfo, log, WalletInitializationError, Web3AuthError } from "../base";
+import { useWeb3AuthInner } from "../vue/composables/useWeb3AuthInner";
+import { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from "./index";
+import type { BaseLinkedAccountInfo, LinkAccountParams, LinkAccountResult, UnlinkAccountResult } from "./interfaces";
+
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest };
+export type {
+  CITADEL_NETWORK,
+  CitadelLinkAccountPayload,
+  LinkAccountParams,
+  LinkAccountResult,
+  BaseLinkedAccountInfo as LinkedAccountInfo,
+  UnlinkAccountPayload,
+  UnlinkAccountResult,
+} from "./interfaces";
+
+export interface IUseLinkAccount {
+  loading: Ref<boolean>;
+  error: Ref<Web3AuthError | null>;
+  linkedAccounts: Ref<BaseLinkedAccountInfo[]>;
+  linkAccount(params: LinkAccountParams): Promise<LinkAccountResult | void>;
+  unlinkAccount(address: string): Promise<UnlinkAccountResult | void>;
+}
+
+export interface IUseSwitchAccount {
+  loading: Ref<boolean>;
+  error: Ref<Web3AuthError | null>;
+  switchAccount(account: LinkedAccountInfo): Promise<void>;
+}
+
+export interface IUseWallets {
+  loading: Ref<boolean>;
+  error: Ref<Web3AuthError | null>;
+  wallets: Ref<LinkedAccountInfo[]>;
+  getWallets(): Promise<void>;
+}
+
+export const useLinkAccount = (): IUseLinkAccount => {
+  const { web3Auth } = useWeb3AuthInner();
+  const loading = ref(false);
+  const error = ref<Web3AuthError | null>(null);
+  const linkedAccounts = ref<BaseLinkedAccountInfo[]>([]);
+
+  const linkAccount = async (params: LinkAccountParams): Promise<LinkAccountResult | void> => {
+    if (!web3Auth.value) throw WalletInitializationError.notReady();
+    try {
+      error.value = null;
+      loading.value = true;
+      const result = await web3Auth.value.linkAccount(params);
+      linkedAccounts.value = result.linkedAccounts;
+      return result;
+    } catch (err) {
+      log.error("Error linking account", err);
+      error.value = err as Web3AuthError;
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  const unlinkAccount = async (address: string): Promise<UnlinkAccountResult | void> => {
+    if (!web3Auth.value) throw WalletInitializationError.notReady();
+    try {
+      error.value = null;
+      loading.value = true;
+      const result = await web3Auth.value.unlinkAccount(address);
+      linkedAccounts.value = result.linkedAccounts;
+      return result;
+    } catch (err) {
+      log.error("Error unlinking account", err);
+      error.value = err as Web3AuthError;
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  return {
+    loading,
+    error,
+    linkAccount,
+    unlinkAccount,
+    linkedAccounts,
+  };
+};
+
+export const useSwitchAccount = (): IUseSwitchAccount => {
+  const { web3Auth } = useWeb3AuthInner();
+  const loading = ref(false);
+  const error = ref<Web3AuthError | null>(null);
+
+  const switchAccount = async (account: LinkedAccountInfo): Promise<void> => {
+    if (!web3Auth.value) throw WalletInitializationError.notReady();
+    error.value = null;
+    loading.value = true;
+    try {
+      await web3Auth.value.switchAccount(account);
+    } catch (err) {
+      log.error("Error switching account", err);
+      error.value = err as Web3AuthError;
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  return {
+    loading,
+    error,
+    switchAccount,
+  };
+};
+
+export const useWallets = (): IUseWallets => {
+  const { web3Auth } = useWeb3AuthInner();
+  const loading = ref(false);
+  const error = ref<Web3AuthError | null>(null);
+  const wallets = ref<LinkedAccountInfo[]>([]);
+
+  const getWallets = async (): Promise<void> => {
+    if (!web3Auth.value) throw WalletInitializationError.notReady();
+    error.value = null;
+    loading.value = true;
+    try {
+      const result = await web3Auth.value.getLinkedAccounts();
+      wallets.value = result;
+    } catch (err) {
+      log.error("Error getting wallets", err);
+      error.value = err as Web3AuthError;
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  return {
+    loading,
+    error,
+    wallets,
+    getWallets,
+  };
+};
diff --git a/packages/no-modal/src/base/analytics.ts b/packages/no-modal/src/base/analytics.ts
index b2c4f1bd7..5ffa41c60 100644
--- a/packages/no-modal/src/base/analytics.ts
+++ b/packages/no-modal/src/base/analytics.ts
@@ -135,6 +135,18 @@ export const ANALYTICS_EVENTS = {
   WALLET_CHECKOUT_CLICKED: "Wallet Checkout Clicked",
   WALLET_RECEIVE_CLICKED: "Wallet Receive Clicked",
   WALLET_SWAP_CLICKED: "Wallet Swap Clicked",
+  // Account Linking
+  ACCOUNT_LINKING_STARTED: "Account Linking Started",
+  ACCOUNT_LINKING_COMPLETED: "Account Linking Completed",
+  ACCOUNT_LINKING_FAILED: "Account Linking Failed",
+  // Account Unlinking
+  ACCOUNT_UNLINKING_STARTED: "Account Unlinking Started",
+  ACCOUNT_UNLINKING_COMPLETED: "Account Unlinking Completed",
+  ACCOUNT_UNLINKING_FAILED: "Account Unlinking Failed",
+  // Account switch (active connected wallet)
+  ACCOUNT_SWITCH_STARTED: "Account Switch Started",
+  ACCOUNT_SWITCH_COMPLETED: "Account Switch Completed",
+  ACCOUNT_SWITCH_FAILED: "Account Switch Failed",
 };
 
 export const ANALYTICS_INTEGRATION_TYPE = {
diff --git a/packages/no-modal/src/base/connector/baseConnector.ts b/packages/no-modal/src/base/connector/baseConnector.ts
index 8bcd45654..d10179837 100644
--- a/packages/no-modal/src/base/connector/baseConnector.ts
+++ b/packages/no-modal/src/base/connector/baseConnector.ts
@@ -212,5 +212,9 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
   abstract enableMFA(params?: T): Promise<void>;
   abstract manageMFA(params?: T): Promise<void>;
   abstract getAuthTokenInfo(): Promise<AuthTokenInfo>;
+  abstract generateChallengeAndSign(
+    authServerUrl?: string,
+    accounts?: string[]
+  ): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }>;
   abstract switchChain(params: { chainId: string }): Promise<void>;
 }
diff --git a/packages/no-modal/src/base/connector/constants.ts b/packages/no-modal/src/base/connector/constants.ts
index 14a99bfdc..91fde07c3 100644
--- a/packages/no-modal/src/base/connector/constants.ts
+++ b/packages/no-modal/src/base/connector/constants.ts
@@ -18,6 +18,8 @@ export const CONNECTOR_EVENTS = {
   CONNECTORS_UPDATED: "connectors_updated",
   MFA_ENABLED: "mfa_enabled",
   REHYDRATION_ERROR: "rehydration_error",
+  /** Emitted when the active public `connection` changes without a full reconnect (e.g. account switch). */
+  CONNECTION_UPDATED: "connection_updated",
   CONSENT_ACCEPTED: "consent_accepted",
 } as const;
 
diff --git a/packages/no-modal/src/base/connector/interfaces.ts b/packages/no-modal/src/base/connector/interfaces.ts
index 5c080e452..ff2540b7c 100644
--- a/packages/no-modal/src/base/connector/interfaces.ts
+++ b/packages/no-modal/src/base/connector/interfaces.ts
@@ -1,3 +1,4 @@
+import { CaipAccountId } from "@metamask/connect-evm";
 import type { Wallet } from "@wallet-standard/base";
 import {
   AUTH_CONNECTION_TYPE,
@@ -15,6 +16,7 @@ import {
   type WEB3AUTH_NETWORK_TYPE,
 } from "@web3auth/auth";
 
+import { BaseLinkedAccountInfo } from "../../account-linking/interfaces";
 import { type Analytics } from "../analytics";
 import type { ChainNamespaceType, ConnectorNamespaceType, CustomChainConfig } from "../chain/IChainInterface";
 import type { IWeb3AuthCoreOptions } from "../core/IWeb3Auth";
@@ -23,8 +25,33 @@ import type { LoginModeType, ProjectConfig } from "../interfaces";
 import type { ProviderEvents, SafeEventEmitterProvider } from "../provider/IProvider";
 import { WALLET_CONNECTOR_TYPE } from "../wallet";
 import { CONNECTOR_CATEGORY, CONNECTOR_EVENTS, CONNECTOR_STATUS } from "./constants";
+/**
+ *
+ */
+export interface LinkedAccountInfo extends BaseLinkedAccountInfo {
+  /** Linked account id */
+  id: string;
 
-export type UserInfo = AuthUserInfo;
+  /** Whether the account is the primary account for the user */
+  isPrimary: boolean;
+
+  /** Wallet address of the connected account */
+  eoaAddress: string;
+
+  /** Address of the account abstraction for the account */
+  aaAddress?: string;
+
+  /** Provider of the account abstraction for the account */
+  aaProvider?: string;
+
+  /** Connector name of the account */
+  connector: string;
+
+  /** Indicates if the account is the active account */
+  active: boolean;
+}
+
+export type UserInfo = AuthUserInfo & { linkedAccounts?: LinkedAccountInfo[] };
 
 export { UX_MODE, UX_MODE_TYPE, WEB3AUTH_NETWORK, WEB3AUTH_NETWORK_TYPE };
 
@@ -90,12 +117,16 @@ export interface IConnector<T> extends SafeEventEmitter {
   icon?: string;
   init(options?: ConnectorInitOptions): Promise<void>;
   disconnect(options?: { cleanup: boolean }): Promise<void>;
-  connect(params: T & { chainId: string }): Promise<Connection | null>;
+  connect(params: T & BaseConnectorLoginParams): Promise<Connection | null>;
   getUserInfo(): Promise<Partial<UserInfo>>;
   enableMFA(params?: T): Promise<void>;
   manageMFA(params?: T): Promise<void>;
   switchChain(params: { chainId: string }): Promise<void>;
   getAuthTokenInfo(): Promise<AuthTokenInfo>;
+  generateChallengeAndSign(
+    authServerUrl?: string,
+    accounts?: string[]
+  ): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }>;
   cleanup?(): Promise<void>;
 }
 
@@ -107,7 +138,17 @@ export type ConnectorParams = {
 
 export type BaseConnectorLoginParams = {
   chainId: string;
-  getAuthTokenInfo: boolean;
+  getAuthTokenInfo?: boolean;
+
+  /**
+   * for metamask connector, array of caip account ids to be used for connecting to the wallet
+   */
+  caipAccountIds?: CaipAccountId[];
+
+  /**
+   * Whether the connection is for the primary account or account linking
+   */
+  isAccountLinking?: boolean;
 };
 
 export type ConnectorFn = (params: ConnectorParams) => IConnector<unknown>;
@@ -117,6 +158,10 @@ export type CONNECTED_EVENT_DATA = Connection & {
   pendingUserConsent?: boolean;
 };
 
+export type DISCONNECTED_EVENT_DATA = {
+  connector: WALLET_CONNECTOR_TYPE | string;
+};
+
 export type AUTHORIZED_EVENT_DATA = {
   connector: WALLET_CONNECTOR_TYPE | string;
   authTokenInfo: AuthTokenInfo;
@@ -127,11 +172,13 @@ export interface IConnectorDataEvent {
   data: unknown;
 }
 
+export type CONNECTION_UPDATED_EVENT_DATA = Connection;
+
 export type ConnectorEvents = {
   [CONNECTOR_EVENTS.NOT_READY]: () => void;
   [CONNECTOR_EVENTS.READY]: (connector: WALLET_CONNECTOR_TYPE | string) => void;
   [CONNECTOR_EVENTS.CONNECTED]: (data: CONNECTED_EVENT_DATA) => void;
-  [CONNECTOR_EVENTS.DISCONNECTED]: () => void;
+  [CONNECTOR_EVENTS.DISCONNECTED]: (data?: DISCONNECTED_EVENT_DATA) => 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;
@@ -143,6 +190,7 @@ export type ConnectorEvents = {
   [CONNECTOR_EVENTS.MFA_ENABLED]: (isMFAEnabled: boolean) => void;
   [CONNECTOR_EVENTS.CONSENT_REQUIRING]: (data: CONNECTED_EVENT_DATA) => void;
   [CONNECTOR_EVENTS.CONSENT_ACCEPTED]: (data: CONNECTED_EVENT_DATA & { loginMode: LoginModeType }) => void;
+  [CONNECTOR_EVENTS.CONNECTION_UPDATED]: (data: CONNECTION_UPDATED_EVENT_DATA) => void;
 };
 
 export interface BaseConnectorConfig {
diff --git a/packages/no-modal/src/base/core/IWeb3Auth.ts b/packages/no-modal/src/base/core/IWeb3Auth.ts
index 1b63b88d8..82603242e 100644
--- a/packages/no-modal/src/base/core/IWeb3Auth.ts
+++ b/packages/no-modal/src/base/core/IWeb3Auth.ts
@@ -12,11 +12,13 @@ import {
 } from "@web3auth/auth";
 import { type WsEmbedParams } from "@web3auth/ws-embed";
 
+import { type LinkAccountParams, type LinkAccountResult, UnlinkAccountResult } from "../../account-linking";
 import { type ChainNamespaceType, type CustomChainConfig } from "../chain/IChainInterface";
 import {
   type AuthTokenInfo,
   CONNECTED_EVENT_DATA,
   type Connection,
+  CONNECTION_UPDATED_EVENT_DATA,
   CONNECTOR_EVENTS,
   CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   type CONNECTOR_STATUS_TYPE,
@@ -24,6 +26,7 @@ import {
   type ConnectorFn,
   type IBaseProvider,
   type IConnector,
+  LinkedAccountInfo,
   type UserInfo,
   type WEB3AUTH_NETWORK_TYPE,
 } from "../connector";
@@ -212,7 +215,7 @@ export type LoginParamMap = {
 export interface IWeb3AuthCore extends SafeEventEmitter {
   currentChainId: string | null;
   readonly coreOptions: IWeb3AuthCoreOptions;
-  connectedConnectorName: WALLET_CONNECTOR_TYPE | null;
+  primaryConnectorName: WALLET_CONNECTOR_TYPE | null;
   currentChain: CustomChainConfig | undefined;
   status: CONNECTOR_STATUS_TYPE;
   connection: Connection | null;
@@ -239,6 +242,39 @@ export interface IWeb3Auth extends IWeb3AuthCore {
   manageMFA<T>(params: T): Promise<void>;
   setAnalyticsProperties(properties: Record<string, unknown>): void;
   cleanup(): Promise<void>;
+
+  /**
+   * Switch the active connection to a linked wallet: connects an isolated
+   * instance of that wallet’s connector, updates `connection.ethereumProvider` / `solanaWallet`,
+   * and emits `connection_updated` so Wagmi/UI can resync.
+   * The auxiliary connector stays connected (not torn down after switch). The previous auxiliary
+   * connector is disconnected when starting another switch or when the primary session disconnects.
+   *
+   * Requires an AUTH primary session and a matching `userInfo.linkedAccounts` entry.
+   */
+  switchAccount(account: LinkedAccountInfo): Promise<void>;
+
+  /**
+   * Link an external wallet to the currently authenticated user account
+   * via the Citadel account-linking endpoint.
+   *
+   * Requires:
+   * - The user to be currently connected with the AUTH connector.
+   * - `accountLinking.serverUrl` to be set in the Web3Auth constructor options.
+   *
+   * @param params - Linking parameters including the target connector name.
+   * @returns A result object confirming the link, including the linked address.
+   */
+  linkAccount(params: LinkAccountParams): Promise<LinkAccountResult>;
+
+  /**
+   * Unlink an external wallet from the currently authenticated user account
+   * via the Citadel account-unlinking endpoint.
+   *
+   * @param params - Unlinking parameters including the target account address.
+   * @returns A result object confirming the unlink.
+   */
+  unlinkAccount(address: string): Promise<UnlinkAccountResult>;
 }
 
 export type SDK_CONNECTED_EVENT_DATA = CONNECTED_EVENT_DATA & { loginMode: LoginModeType; pendingUserConsent?: boolean };
@@ -250,6 +286,7 @@ export type Web3AuthNoModalEvents = Omit<ConnectorEvents, "connected" | "errored
   [CONNECTOR_EVENTS.CONSENT_REQUIRING]: () => void;
   [CONNECTOR_EVENTS.CONSENT_ACCEPTED]: (data: SDK_CONSENT_ACCEPTED_EVENT_DATA) => void;
   [CONNECTOR_EVENTS.ERRORED]: (error: Web3AuthError, loginMode: LoginModeType) => void;
+  [CONNECTOR_EVENTS.CONNECTION_UPDATED]: (data: CONNECTION_UPDATED_EVENT_DATA) => void;
   MODAL_VISIBILITY: (visibility: boolean) => void;
 };
 
diff --git a/packages/no-modal/src/base/errors/index.ts b/packages/no-modal/src/base/errors/index.ts
index 55ba711e9..d58507641 100644
--- a/packages/no-modal/src/base/errors/index.ts
+++ b/packages/no-modal/src/base/errors/index.ts
@@ -228,6 +228,61 @@ export class WalletOperationsError extends Web3AuthError {
   }
 }
 
+export class AccountLinkingError extends Web3AuthError {
+  protected static messages: ErrorCodes = {
+    5000: "Custom",
+    5401: "Account linking request failed",
+    5402: "Citadel server URL is not configured",
+    5403: "Primary identity token is not available",
+    5404: "Failed to obtain wallet proof token",
+    5405: "Connector is not supported for wallet linking",
+    5406: "Cannot unlink active account",
+    5407: "Account not linked",
+    5408: "Cannot unlink primary account",
+  };
+
+  public constructor(code: number, message?: string, cause?: unknown) {
+    super(code, message, cause);
+    Object.defineProperty(this, "name", { value: "AccountLinkingError", configurable: true });
+  }
+
+  public static fromCode(code: number, extraMessage = "", cause?: unknown): AccountLinkingError {
+    return new AccountLinkingError(code, `${AccountLinkingError.messages[code]}. ${extraMessage}`, cause);
+  }
+
+  public static requestFailed(extraMessage = "", cause?: unknown): AccountLinkingError {
+    return AccountLinkingError.fromCode(5401, extraMessage, cause);
+  }
+
+  public static serverNotConfigured(extraMessage = "", cause?: unknown): AccountLinkingError {
+    return AccountLinkingError.fromCode(5402, extraMessage, cause);
+  }
+
+  public static primaryTokenNotAvailable(extraMessage = "", cause?: unknown): AccountLinkingError {
+    return AccountLinkingError.fromCode(5403, extraMessage, cause);
+  }
+
+  public static walletProofFailed(extraMessage = "", cause?: unknown): AccountLinkingError {
+    return AccountLinkingError.fromCode(5404, extraMessage, cause);
+  }
+
+  public static unsupportedConnector(extraMessage = "", cause?: unknown): AccountLinkingError {
+    return AccountLinkingError.fromCode(5405, extraMessage, cause);
+  }
+
+  public static cannotUnlinkActiveAccount(): AccountLinkingError {
+    return AccountLinkingError.fromCode(5406);
+  }
+
+  public static accountNotLinked(message = "", cause?: unknown): AccountLinkingError {
+    return AccountLinkingError.fromCode(5407, message, cause);
+  }
+
+  public static cannotUnlinkPrimaryAccount(): AccountLinkingError {
+    return AccountLinkingError.fromCode(5408);
+  }
+}
+
 export class WalletProviderError extends Web3AuthError {
   protected static messages: ErrorCodes = {
     5000: "Custom",
diff --git a/packages/no-modal/src/base/interfaces.ts b/packages/no-modal/src/base/interfaces.ts
index 7855bb570..7e1ed82ea 100644
--- a/packages/no-modal/src/base/interfaces.ts
+++ b/packages/no-modal/src/base/interfaces.ts
@@ -3,6 +3,7 @@ import type { SmartAccountEipStandardType, SmartAccountType } from "@toruslabs/e
 import { AuthConnectionConfigItem, type WhiteLabelData } from "@web3auth/auth";
 
 import { type ChainNamespaceType, type CustomChainConfig } from "./chain/IChainInterface";
+import { LinkedAccountInfo } from "./connector";
 import { LOGIN_MODE, MODAL_SIGN_IN_METHODS, SMART_ACCOUNT_WALLET_SCOPE, WIDGET_TYPE } from "./constants";
 import { WALLET_CONNECTOR_TYPE } from "./wallet";
 
@@ -13,11 +14,12 @@ export interface WhitelistResponse {
 
 export interface IWeb3AuthState {
   cachedConnector: string | null;
-  connectedConnectorName: WALLET_CONNECTOR_TYPE | null;
+  primaryConnectorName: WALLET_CONNECTOR_TYPE | null;
   currentChainId: string;
   idToken: string | null;
   accessToken: string | null;
   refreshToken: string | null;
+  activeAccount: LinkedAccountInfo | null;
   hasUserConsent?: boolean;
 }
 
diff --git a/packages/no-modal/src/base/utils.ts b/packages/no-modal/src/base/utils.ts
index cf6f4771b..b722c9d94 100644
--- a/packages/no-modal/src/base/utils.ts
+++ b/packages/no-modal/src/base/utils.ts
@@ -1,4 +1,4 @@
-import { CHAIN_NAMESPACES, cloneDeep } from "@toruslabs/base-controllers";
+import { CHAIN_NAMESPACES, ChainNamespaceType, cloneDeep } from "@toruslabs/base-controllers";
 import { CITADEL_SERVER_MAP, DASHBOARD_PUBLIC_API_MAP } from "@toruslabs/constants";
 import { type AccountAbstractionMultiChainConfig } from "@toruslabs/ethereum-controllers";
 import { get } from "@toruslabs/http-helpers";
@@ -20,8 +20,8 @@ export const dashboardPublicApiUrl = (buildEnv: BUILD_ENV_TYPE) => {
   return DASHBOARD_PUBLIC_API_MAP[buildEnv];
 };
 
-export const citadelServerUrl = (buildEnv?: BUILD_ENV_TYPE): string => {
-  return CITADEL_SERVER_MAP[buildEnv || BUILD_ENV.PRODUCTION];
+export const citadelServerUrl = (buildEnv: BUILD_ENV_TYPE = BUILD_ENV.PRODUCTION): string => {
+  return CITADEL_SERVER_MAP[buildEnv];
 };
 
 export const fetchProjectConfig = async ({
@@ -202,3 +202,15 @@ export const getCaipChainId = (chain: Pick<CustomChainConfig, "chainNamespace" |
   // for other chain namespaces, we just return the chainId as is
   return `${chain.chainNamespace}:${chain.chainId}`;
 };
+
+/**
+ * Parse the chain namespace from the citadel response
+ * @param chainNamespace - The chain namespace from the citadel response
+ * @returns The parsed chain namespace
+ */
+export const parseChainNamespaceFromCitadelResponse = (chainNamespace: string): ChainNamespaceType => {
+  if (chainNamespace === "evm") {
+    return CHAIN_NAMESPACES.EIP155;
+  }
+  return chainNamespace as ChainNamespaceType;
+};
diff --git a/packages/no-modal/src/connectors/auth-connector/authConnector.ts b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
index dbdc3342c..8af301ca7 100644
--- a/packages/no-modal/src/connectors/auth-connector/authConnector.ts
+++ b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
@@ -1,6 +1,6 @@
-import { type ProviderConfig } from "@toruslabs/base-controllers";
+import { ChainNamespaceType, type ProviderConfig } from "@toruslabs/base-controllers";
 import { CITADEL_SERVER_MAP } from "@toruslabs/constants";
-import { put } from "@toruslabs/http-helpers";
+import { get, put } from "@toruslabs/http-helpers";
 import { SecurePubSub } from "@toruslabs/secure-pub-sub";
 import type { Wallet } from "@wallet-standard/base";
 import {
@@ -25,11 +25,22 @@ import { type default as WsEmbed, WS_EMBED_LOGIN_MODE } from "@web3auth/ws-embed
 import deepmerge from "deepmerge";
 
 import {
+  CITADEL_NETWORK,
+  LinkAccountResult,
+  makeAccountLinkingRequest,
+  makeAccountUnlinkingRequest,
+  UnlinkAccountResult,
+} from "../../account-linking";
+import {
+  AccountLinkingError,
+  Analytics,
+  ANALYTICS_EVENTS,
   AuthLoginParams,
   AuthTokenInfo,
   BaseConnector,
   BaseConnectorLoginParams,
   CHAIN_NAMESPACES,
+  citadelServerUrl,
   cloneDeep,
   CONNECTED_EVENT_DATA,
   CONNECTED_STATUSES,
@@ -45,8 +56,12 @@ import {
   ConnectorNamespaceType,
   ConnectorParams,
   getCaipChainId,
+  getErrorAnalyticsProperties,
+  IConnector,
   IProvider,
+  LinkedAccountInfo,
   log,
+  parseChainNamespaceFromCitadelResponse,
   UserInfo,
   WALLET_CONNECTOR_TYPE,
   WALLET_CONNECTORS,
@@ -56,9 +71,21 @@ import {
 } from "../../base";
 import { generateNonce, parseToken } from "../utils";
 import { AuthSolanaWallet } from "./authSolanaWallet";
-import type { AuthConnectorOptions, LoginSettings, PrivateKeyProvider, WalletServicesSettings } from "./interface";
-
-class AuthConnector extends BaseConnector<AuthLoginParams> {
+import {
+  type AuthConnectorLinkAccountParams,
+  type AuthConnectorOptions,
+  type AuthConnectorSessionTokens,
+  type AuthConnectorSwitchAccountContext,
+  type AuthConnectorSwitchAccountResult,
+  type AuthConnectorUnlinkAccountParams,
+  IAuthConnector,
+  type LoginSettings,
+  type PrivateKeyProvider,
+  UserInfoWithLinkedAccounts,
+  type WalletServicesSettings,
+} from "./interface";
+
+class AuthConnector extends BaseConnector<AuthLoginParams> implements IAuthConnector {
   readonly name: WALLET_CONNECTOR_TYPE = WALLET_CONNECTORS.AUTH;
 
   readonly connectorNamespace: ConnectorNamespaceType = CONNECTOR_NAMESPACES.MULTICHAIN;
@@ -85,6 +112,8 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
 
   private _solanaWallet: Wallet | null = null;
 
+  private analytics: Analytics;
+
   constructor(params: AuthConnectorOptions) {
     super(params);
 
@@ -92,6 +121,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
     this.loginSettings = params.loginSettings || { authConnection: "" };
     this.wsSettings = params.walletServicesSettings || { loginMode: WS_EMBED_LOGIN_MODE.PLUGIN };
     this.authConnectionConfig = params.authConnectionConfig || [];
+    this.analytics = params.analytics || new Analytics();
   }
 
   get provider(): IProvider | null {
@@ -283,7 +313,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
 
     this.rehydrated = false;
     this._solanaWallet = null;
-    this.emit(CONNECTOR_EVENTS.DISCONNECTED);
+    this.emit(CONNECTOR_EVENTS.DISCONNECTED, { connector: WALLET_CONNECTORS.AUTH });
   }
 
   async getAuthTokenInfo(): Promise<AuthTokenInfo> {
@@ -310,8 +340,28 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   async getUserInfo(): Promise<Partial<UserInfo>> {
     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;
+    const [userInfo, linkedAccounts] = await Promise.all([this.authInstance.getUserInfo(), this.getLinkedAccounts()]);
+    return {
+      ...userInfo,
+      linkedAccounts,
+    };
+  }
+
+  async getLinkedAccounts(): Promise<LinkedAccountInfo[]> {
+    const accessToken = await this.authInstance.authSessionManager.getAccessToken();
+    if (!accessToken) throw WalletLoginError.connectionError("Could not obtain an access token from the current AUTH session.");
+
+    const citadelUserInfo = await get<UserInfoWithLinkedAccounts>(`${citadelServerUrl(this.coreOptions.authBuildEnv)}/v1/user`, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+    const linkedAccounts = citadelUserInfo?.accounts || [];
+    return linkedAccounts.map((account) => ({
+      ...account,
+      // by default, the primary account is the active account
+      active: account.isPrimary,
+    }));
   }
 
   public async switchChain(params: { chainId: string }, init = false): Promise<void> {
@@ -359,6 +409,389 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
     return providerConfig;
   }
 
+  public async generateChallengeAndSign(): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }> {
+    // we do not support this for auth connector, as of now. since auth login returns a valid idToken
+    throw new Error("Not implemented");
+  }
+
+  public async switchAccount(account: LinkedAccountInfo, context: AuthConnectorSwitchAccountContext): Promise<AuthConnectorSwitchAccountResult> {
+    if (!CONNECTED_STATUSES.includes(this.status)) {
+      throw WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before switching accounts.");
+    }
+
+    try {
+      const userInfo = await this.getUserInfo();
+      const linkedAccounts = userInfo.linkedAccounts ?? [];
+      const targetAccount = linkedAccounts.find((candidate) => candidate.id === account.id);
+      if (!targetAccount) {
+        throw AccountLinkingError.requestFailed(`No connected wallet matches account id "${account.id}". Refresh user info and try again.`);
+      }
+
+      const currentActiveAccount = context.activeAccount;
+      const isTargetAlreadyActive = currentActiveAccount ? currentActiveAccount.id === targetAccount.id : targetAccount.isPrimary;
+      if (isTargetAlreadyActive) {
+        return;
+      }
+
+      this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_SWITCH_STARTED, this.getSwitchAccountTrackData(targetAccount));
+
+      if (targetAccount.connector === WALLET_CONNECTORS.AUTH && targetAccount.isPrimary) {
+        const activeChainId = this.getChainIdForLinkedAccount(targetAccount, this.provider?.chainId ?? context.currentChainId);
+        const ethereumProvider = this.provider;
+        const solanaWallet = this.solanaWallet;
+        if (!ethereumProvider && !solanaWallet) {
+          throw AccountLinkingError.requestFailed("Failed to restore the primary AUTH session for account switch.");
+        }
+
+        return {
+          kind: "primary",
+          targetAccount,
+          activeAccount: null,
+          activeChainId,
+          connectorName: this.name,
+          connectorNamespace: this.connectorNamespace,
+          ethereumProvider,
+          solanaWallet,
+        };
+      }
+
+      return {
+        kind: "external",
+        targetAccount,
+        activeAccount: targetAccount,
+        activeChainId: this.getChainIdForLinkedAccount(targetAccount, context.currentChainId),
+      };
+    } catch (error) {
+      await this.trackSwitchAccountFailed(account, error);
+      throw error;
+    }
+  }
+
+  public async trackSwitchAccountCompleted(account: LinkedAccountInfo): Promise<void> {
+    await this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_SWITCH_COMPLETED, {
+      ...this.getSwitchAccountTrackData(account),
+      connector: account.connector,
+    });
+  }
+
+  public async trackSwitchAccountFailed(account: Pick<LinkedAccountInfo, "id" | "accountType" | "eoaAddress">, error: unknown): Promise<void> {
+    await this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_SWITCH_FAILED, {
+      ...this.getSwitchAccountTrackData(account),
+      ...getErrorAnalyticsProperties(error),
+    });
+  }
+
+  public async linkAccount(params: AuthConnectorLinkAccountParams): Promise<LinkAccountResult> {
+    if (!CONNECTED_STATUSES.includes(this.status)) {
+      throw WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before linking an account.");
+    }
+    const { connectorName, chainId, walletConnector } = params;
+
+    try {
+      if (!walletConnector.connected) {
+        const connection = await walletConnector.connect({ chainId, isAccountLinking: true });
+        if (!connection) {
+          throw AccountLinkingError.walletProofFailed(`Failed to connect to "${params.connectorName}" for account linking.`);
+        }
+      }
+    } catch (error) {
+      if (error instanceof AccountLinkingError) {
+        throw error;
+      }
+      throw AccountLinkingError.walletProofFailed(error instanceof Error ? error.message : String(error), error);
+    }
+
+    const trackData = {
+      connector: this.name,
+      linking_connector: connectorName,
+      chain_id: params.chainId,
+    };
+
+    try {
+      await this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_LINKING_STARTED, trackData);
+
+      const { accessToken, idToken } = await this.getPrimaryAuthSession(params.authSessionTokens);
+      const walletProof = await this.createWalletLinkingProof(params.walletConnector);
+
+      const authServerUrl = citadelServerUrl(this.coreOptions.authBuildEnv);
+      const result = await makeAccountLinkingRequest(authServerUrl, accessToken, {
+        idToken,
+        network: walletProof.network,
+        connector: params.connectorName,
+        message: walletProof.challenge,
+        signature: {
+          s: walletProof.signature,
+          t: walletProof.signatureType,
+        },
+      });
+
+      this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_LINKING_COMPLETED, {
+        ...trackData,
+        linked_address: walletProof.address,
+      });
+
+      return result;
+    } catch (error) {
+      this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_LINKING_FAILED, {
+        ...trackData,
+        ...getErrorAnalyticsProperties(error),
+      });
+
+      // disconnect the wallet connector to avoid any leftover state
+      try {
+        await walletConnector.disconnect({ cleanup: true });
+      } catch (disconnectError) {
+        log.debug("Failed to disconnect wallet connector after linking failure", disconnectError);
+      }
+      throw error;
+    }
+  }
+
+  public async unlinkAccount(params: AuthConnectorUnlinkAccountParams): Promise<UnlinkAccountResult> {
+    if (!CONNECTED_STATUSES.includes(this.status)) {
+      throw WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before unlinking an account.");
+    }
+    const { address, authSessionTokens } = params;
+    const trackData = {
+      connector: this.name,
+      address,
+    };
+
+    await this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_UNLINKING_STARTED, trackData);
+
+    try {
+      const { accessToken, idToken, linkedAccounts } = await this.getPrimaryAuthSession(authSessionTokens, {
+        includeLinkedAccounts: true,
+      });
+
+      const network = this.getNetworkForUnlinkAddress(linkedAccounts, address);
+      const authServerUrl = citadelServerUrl(this.coreOptions.authBuildEnv);
+      const result = await makeAccountUnlinkingRequest(authServerUrl, accessToken, {
+        idToken,
+        address,
+        network,
+      });
+
+      await this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_UNLINKING_COMPLETED, {
+        ...trackData,
+        linked_address: address,
+      });
+
+      return result;
+    } catch (error) {
+      await this.analytics.track(ANALYTICS_EVENTS.ACCOUNT_UNLINKING_FAILED, {
+        ...trackData,
+        ...getErrorAnalyticsProperties(error),
+      });
+      throw error;
+    }
+  }
+
+  public getChainIdForLinkedAccount(account: Pick<LinkedAccountInfo, "chainNamespace" | "connector">, preferredChainId?: string | null): string {
+    const accountChainNamespace = account.chainNamespace ? parseChainNamespaceFromCitadelResponse(account.chainNamespace) : null;
+
+    if (preferredChainId) {
+      const preferredChain = this.coreOptions.chains.find((chain) => chain.chainId === preferredChainId);
+      if (preferredChain && (!accountChainNamespace || preferredChain.chainNamespace === accountChainNamespace)) {
+        return preferredChainId;
+      }
+    }
+
+    if (accountChainNamespace) {
+      const namespaceChain = this.coreOptions.chains.find((chain) => chain.chainNamespace === accountChainNamespace);
+      if (namespaceChain) {
+        return namespaceChain.chainId;
+      }
+    }
+
+    throw WalletInitializationError.invalidParams(`No compatible chainId found for connector "${account.connector}".`);
+  }
+
+  public async assertSwitchAccountConnectorMatchesTarget(
+    connector: IConnector<unknown>,
+    account: Pick<LinkedAccountInfo, "chainNamespace" | "connector" | "eoaAddress">
+  ): Promise<void> {
+    if (!account.chainNamespace) {
+      throw AccountLinkingError.requestFailed(`Could not determine the chain namespace for linked account "${account.eoaAddress}".`);
+    }
+
+    const chainNamespace = parseChainNamespaceFromCitadelResponse(account.chainNamespace);
+    let connectedAddress: string | null = null;
+
+    if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
+      const accounts = connector.provider ? await connector.provider.request<never, string[]>({ method: "eth_accounts" }) : [];
+      connectedAddress = accounts?.[0] ?? null;
+    } else if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      connectedAddress = connector.solanaWallet?.accounts?.[0]?.address ?? null;
+    } else {
+      throw AccountLinkingError.requestFailed(`Unsupported chain namespace "${account.chainNamespace}" for linked account "${account.eoaAddress}".`);
+    }
+
+    if (!connectedAddress) {
+      throw AccountLinkingError.requestFailed(
+        `Connector "${account.connector}" is not connected to linked account "${account.eoaAddress}". Connect the intended wallet account and try again.`
+      );
+    }
+
+    const isExpectedAddress =
+      chainNamespace === CHAIN_NAMESPACES.EIP155
+        ? connectedAddress.toLowerCase() === account.eoaAddress.toLowerCase()
+        : connectedAddress === account.eoaAddress;
+
+    if (!isExpectedAddress) {
+      throw AccountLinkingError.requestFailed(
+        `Connector "${account.connector}" is connected to "${connectedAddress}" instead of linked account "${account.eoaAddress}". Connect the intended wallet account and try again.`
+      );
+    }
+  }
+
+  public toSwitchAccountConnectorError(account: Pick<LinkedAccountInfo, "connector" | "eoaAddress">, error: unknown): AccountLinkingError {
+    if (error instanceof AccountLinkingError && error.code === 5401) {
+      return error;
+    }
+
+    const message = error instanceof Error ? error.message : String(error);
+    const isUnavailableConnectorError =
+      (error instanceof AccountLinkingError && error.code === 5405) || /not available|not initialized|not ready/i.test(message);
+
+    if (isUnavailableConnectorError) {
+      return AccountLinkingError.requestFailed(
+        `Connector "${account.connector}" is not available for linked account "${account.eoaAddress}". Make sure the wallet is installed, unlocked, and accessible, then try again.`,
+        error
+      );
+    }
+
+    return AccountLinkingError.requestFailed(
+      `Failed to connect connector "${account.connector}" for linked account "${account.eoaAddress}". ${message}`,
+      error
+    );
+  }
+
+  private getSwitchAccountTrackData(account: Pick<LinkedAccountInfo, "id" | "accountType" | "eoaAddress">) {
+    return {
+      connector: this.name,
+      account_id: account.id,
+      account_type: account.accountType,
+      switched_to_address: account.eoaAddress ?? null,
+    };
+  }
+
+  private async getPrimaryAuthSession(
+    authSessionTokens: AuthConnectorSessionTokens,
+    options: { includeLinkedAccounts?: boolean } = {}
+  ): Promise<{ accessToken: string; idToken: string; linkedAccounts: LinkedAccountInfo[] }> {
+    const { accessToken: cachedAccessToken, idToken: cachedIdToken } = authSessionTokens;
+    const { includeLinkedAccounts = false } = options;
+    let accessToken = cachedAccessToken;
+    let idToken = cachedIdToken;
+    let linkedAccounts: LinkedAccountInfo[] = [];
+
+    if (includeLinkedAccounts) {
+      const userInfoPromise = this.getUserInfo();
+      if (!accessToken || !idToken) {
+        const [tokenInfo, userInfo] = await Promise.all([this.getAuthTokenInfo(), userInfoPromise]);
+        accessToken = tokenInfo.accessToken;
+        idToken = tokenInfo.idToken;
+        linkedAccounts = userInfo.linkedAccounts ?? [];
+      } else {
+        const userInfo = await userInfoPromise;
+        linkedAccounts = userInfo.linkedAccounts ?? [];
+      }
+    } else if (!accessToken || !idToken) {
+      const tokenInfo = await this.getAuthTokenInfo();
+      accessToken = tokenInfo.accessToken;
+      idToken = tokenInfo.idToken;
+    }
+
+    if (!accessToken || !idToken) {
+      throw AccountLinkingError.primaryTokenNotAvailable("Could not obtain an identity token from the current AUTH session.");
+    }
+
+    return { accessToken, idToken, linkedAccounts };
+  }
+
+  private getNetworkForUnlinkAddress(accounts: LinkedAccountInfo[], address: string): CITADEL_NETWORK {
+    const matchedAccount = accounts.find((account) => {
+      if (!account.chainNamespace || parseChainNamespaceFromCitadelResponse(account.chainNamespace) !== CHAIN_NAMESPACES.EIP155) {
+        return false;
+      }
+      const normalizedAddress = address.toLowerCase();
+      return account.address?.toLowerCase() === normalizedAddress || account.eoaAddress?.toLowerCase() === normalizedAddress;
+    });
+
+    if (!matchedAccount) {
+      throw AccountLinkingError.requestFailed(`No connected wallet matches address "${address}".`);
+    }
+
+    if (!matchedAccount.chainNamespace) {
+      throw AccountLinkingError.requestFailed(`Could not determine the chain namespace for address "${address}".`);
+    }
+
+    const chainNamespace = parseChainNamespaceFromCitadelResponse(matchedAccount.chainNamespace);
+    if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
+      return "ethereum";
+    }
+    if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      return "solana";
+    }
+
+    throw AccountLinkingError.requestFailed(`Unsupported chain namespace "${matchedAccount.chainNamespace}" for address "${address}".`);
+  }
+
+  private async createWalletLinkingProof(connector: IConnector<unknown>): Promise<{
+    address: string;
+    challenge: string;
+    signature: string;
+    signatureType: "eip191" | "sip99";
+    network: CITADEL_NETWORK;
+  }> {
+    const { challenge, signature, chainNamespace } = await connector.generateChallengeAndSign();
+    const address = await this.getLinkingWalletAddress(connector, chainNamespace);
+
+    if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
+      return {
+        address,
+        challenge,
+        signature,
+        signatureType: "eip191",
+        network: "ethereum",
+      };
+    }
+
+    if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      return {
+        address,
+        challenge,
+        signature,
+        signatureType: "sip99",
+        network: "solana",
+      };
+    }
+
+    throw AccountLinkingError.unsupportedConnector(`Connector "${connector.name}" returned unsupported chain namespace "${chainNamespace}".`);
+  }
+
+  private async getLinkingWalletAddress(connector: IConnector<unknown>, chainNamespace: ChainNamespaceType): Promise<string> {
+    if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      const address = connector.solanaWallet?.accounts?.[0]?.address;
+      if (!address) {
+        throw AccountLinkingError.walletProofFailed("No connected Solana account found for account linking.");
+      }
+      return address;
+    }
+
+    if (!connector.provider) {
+      throw AccountLinkingError.walletProofFailed("No connected EVM account found for account linking.");
+    }
+
+    const accounts = await connector.provider.request<never, string[]>({ method: "eth_accounts" });
+    if (!accounts?.length) {
+      throw AccountLinkingError.walletProofFailed("No connected EVM account found for account linking.");
+    }
+
+    return accounts[0];
+  }
+
   private setupSolanaWallet(): void {
     const solanaChains = this.coreOptions.chains.filter((c) => c.chainNamespace === CHAIN_NAMESPACES.SOLANA);
     if (solanaChains.length === 0 || !this.provider) return;
@@ -719,7 +1152,7 @@ type AuthConnectorFuncParams = Omit<AuthConnectorOptions, "coreOptions" | "authC
 };
 
 export const authConnector = (params?: AuthConnectorFuncParams): ConnectorFn => {
-  return ({ projectConfig, coreOptions }: ConnectorParams) => {
+  return ({ projectConfig, coreOptions, analytics }: ConnectorParams) => {
     // Connector settings
     const connectorSettings: AuthConnectorOptions["connectorSettings"] = {};
     const { whitelist, sessionTime } = projectConfig;
@@ -759,9 +1192,32 @@ export const authConnector = (params?: AuthConnectorFuncParams): ConnectorFn =>
       walletServicesSettings: finalWsSettings,
       loginSettings: { ...(params?.loginSettings || {}), mfaLevel: coreOptions.mfaLevel },
       coreOptions,
+      analytics,
       authConnectionConfig: projectConfig.embeddedWalletAuth,
     });
   };
 };
 
+export function isAuthConnector(connector: IConnector<unknown> | null | undefined): connector is AuthConnectorType {
+  if (!connector || connector.name !== WALLET_CONNECTORS.AUTH) {
+    return false;
+  }
+
+  const maybeAuthConnector = connector as unknown as Partial<IAuthConnector>;
+  return (
+    typeof maybeAuthConnector.switchAccount === "function" &&
+    typeof maybeAuthConnector.linkAccount === "function" &&
+    typeof maybeAuthConnector.unlinkAccount === "function"
+  );
+}
+
+export function assertAuthConnector(
+  connector: IConnector<unknown> | null | undefined,
+  errorMessage = "Account linking is only supported when connected with the AUTH connector."
+): asserts connector is AuthConnectorType {
+  if (!isAuthConnector(connector)) {
+    throw WalletLoginError.unsupportedOperation(errorMessage);
+  }
+}
+
 export type AuthConnectorType = AuthConnector;
diff --git a/packages/no-modal/src/connectors/auth-connector/interface.ts b/packages/no-modal/src/connectors/auth-connector/interface.ts
index b00d94233..e704817c6 100644
--- a/packages/no-modal/src/connectors/auth-connector/interface.ts
+++ b/packages/no-modal/src/connectors/auth-connector/interface.ts
@@ -1,7 +1,17 @@
-import { type AuthConnectionConfigItem, type AuthOptions, type LoginParams } from "@web3auth/auth";
+import type { Wallet } from "@wallet-standard/base";
+import { type AuthConnectionConfigItem, type AuthOptions, type LoginParams, type WEB3AUTH_NETWORK_TYPE } from "@web3auth/auth";
 import { type WsEmbedParams } from "@web3auth/ws-embed";
 
-import { type BaseConnectorSettings, type IBaseProvider } from "../../base";
+import { LinkAccountResult, UnlinkAccountResult } from "../../account-linking";
+import {
+  type BaseConnectorSettings,
+  type ConnectorNamespaceType,
+  type IBaseProvider,
+  type IConnector,
+  type IProvider,
+  type LinkedAccountInfo,
+  type WALLET_CONNECTOR_TYPE,
+} from "../../base";
 
 export type LoginSettings = Partial<LoginParams>;
 
@@ -9,6 +19,46 @@ export type PrivateKeyProvider = IBaseProvider<string>;
 
 export type WalletServicesSettings = Omit<WsEmbedParams, "chains" | "chainId"> & { modalZIndex?: number };
 
+export interface AuthConnectorSessionTokens {
+  accessToken: string | null;
+  idToken: string | null;
+}
+
+export interface AuthConnectorLinkAccountParams {
+  authSessionTokens: AuthConnectorSessionTokens;
+  walletConnector: IConnector<unknown>;
+  connectorName: WALLET_CONNECTOR_TYPE | string;
+  chainId?: string;
+}
+
+export interface AuthConnectorSwitchAccountContext {
+  activeAccount: LinkedAccountInfo | null;
+  currentChainId: string | null;
+}
+
+export type AuthConnectorSwitchAccountResult =
+  | {
+      kind: "primary";
+      targetAccount: LinkedAccountInfo;
+      activeAccount: null;
+      activeChainId: string;
+      connectorName: WALLET_CONNECTOR_TYPE;
+      connectorNamespace: ConnectorNamespaceType;
+      ethereumProvider: IProvider | null;
+      solanaWallet: Wallet | null;
+    }
+  | {
+      kind: "external";
+      targetAccount: LinkedAccountInfo;
+      activeAccount: LinkedAccountInfo;
+      activeChainId: string;
+    };
+
+export interface AuthConnectorUnlinkAccountParams {
+  authSessionTokens: AuthConnectorSessionTokens;
+  address: string;
+}
+
 export interface AuthConnectorOptions extends BaseConnectorSettings {
   connectorSettings?: Omit<AuthOptions, "clientId" | "network" | "authConnectionConfig" | "mfaSettings">;
   loginSettings?: LoginSettings;
@@ -16,6 +66,35 @@ export interface AuthConnectorOptions extends BaseConnectorSettings {
   authConnectionConfig?: (AuthConnectionConfigItem & { isDefault?: boolean })[];
 }
 
+export interface UserInfoWithLinkedAccounts {
+  /** User id from the Citadel Server */
+  id: string;
+
+  /** Connection id of the user */
+  connectionId: string;
+
+  /** Identifier of the user. e.g. email, sub */
+  identifier: string;
+
+  /** Public address of the user */
+  publicAddress: string;
+
+  /** Web3Auth network of the user */
+  web3AuthNetwork: WEB3AUTH_NETWORK_TYPE;
+
+  /** Type of the user. e.g. v1, v2 */
+  userType: string;
+
+  /** Connected accounts info, including the primary account */
+  accounts: LinkedAccountInfo[];
+
+  /** Created at timestamp of the user */
+  createdAt: string;
+
+  /** Updated at timestamp of the user */
+  updatedAt: string;
+}
+
 export {
   AUTH_CONNECTION,
   type AUTH_CONNECTION_TYPE,
@@ -29,3 +108,27 @@ export {
   type MFA_SETTINGS,
   type MfaLevelType,
 } from "@web3auth/auth";
+
+export interface IAuthConnector {
+  /**
+   * Resolve the target account and connector-owned switch metadata.
+   * `noModal` applies the returned result to SDK state and providers.
+   */
+  switchAccount(account: LinkedAccountInfo, context: AuthConnectorSwitchAccountContext): Promise<AuthConnectorSwitchAccountResult>;
+
+  /**
+   * Link an external wallet to the authenticated user by using the
+   * `noModal`-provided isolated wallet connector to generate the proof.
+   */
+  linkAccount(params: AuthConnectorLinkAccountParams): Promise<LinkAccountResult>;
+
+  /**
+   * Unlink an external wallet from the authenticated user account.
+   */
+  unlinkAccount(params: AuthConnectorUnlinkAccountParams): Promise<UnlinkAccountResult>;
+
+  /**
+   * Get the connected accounts for the authenticated user.
+   */
+  getLinkedAccounts(): Promise<LinkedAccountInfo[]>;
+}
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 1ce6b913b..6da8282aa 100644
--- a/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
+++ b/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
@@ -1,4 +1,4 @@
-import { signChallenge } from "@toruslabs/base-controllers";
+import { ChainNamespaceType, signChallenge } from "@toruslabs/base-controllers";
 import { bytesToHexPrefixedString, utf8ToBytes } from "@toruslabs/metadata-helpers";
 import { EVM_METHOD_TYPES } from "@web3auth/ws-embed";
 import { generateSiweNonce } from "viem/siwe";
@@ -28,32 +28,44 @@ export abstract class BaseEvmConnector<T> extends BaseConnector<T> {
       const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0] as string);
       if (cached) return cached;
 
-      const chainId = await this.provider.request<never, string>({ method: "eth_chainId" });
-      const currentChainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
-      if (!currentChainConfig) throw WalletInitializationError.invalidParams("chainConfig is required before authentication");
-      const { chainNamespace } = currentChainConfig;
       const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: generateSiweNonce(),
-        issuedAt: new Date().toISOString(),
-      };
+      const { challenge, signature, chainNamespace } = await this.generateChallengeAndSign(authServer, accounts);
+      return this.verifyAndAuthorize({ chainNamespace, signedMessage: signature, challenge, authServer });
+    }
+    throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+  }
 
-      const challenge = await signChallenge(payload, chainNamespace, authServer);
-      const hexChallenge = bytesToHexPrefixedString(utf8ToBytes(challenge));
+  async generateChallengeAndSign(
+    authServerUrl?: string,
+    accounts?: string[]
+  ): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }> {
+    const accountsToUse = accounts || (await this.provider.request<never, string[]>({ method: EVM_METHOD_TYPES.GET_ACCOUNTS }));
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw WalletLoginError.notConnectedError("No accounts found in the connected wallet");
+    }
+    const chainId = await this.provider.request<never, string>({ method: "eth_chainId" });
+    const currentChainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
+    if (!currentChainConfig) throw WalletInitializationError.invalidParams("chainConfig is required before authentication");
+    const { chainNamespace } = currentChainConfig;
+    const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(chainId, 16),
+      version: "1",
+      nonce: generateSiweNonce(),
+      issuedAt: new Date().toISOString(),
+    };
 
-      const signedMessage = await this.provider.request<[string, string], string>({
-        method: EVM_METHOD_TYPES.PERSONAL_SIGN,
-        params: [hexChallenge, accounts[0]],
-      });
+    const challenge = await signChallenge(payload, chainNamespace, authServer);
+    const hexChallenge = bytesToHexPrefixedString(utf8ToBytes(challenge));
 
-      return this.verifyAndAuthorize({ chainNamespace, signedMessage, challenge, authServer });
-    }
-    throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    const signature = await this.provider.request<[string, string], string>({
+      method: EVM_METHOD_TYPES.PERSONAL_SIGN,
+      params: [hexChallenge, accountsToUse[0]],
+    });
+    return { challenge, signature, chainNamespace };
   }
 
   async disconnectSession(): Promise<void> {
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 97fe959fd..834767df0 100644
--- a/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts
+++ b/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts
@@ -1,4 +1,4 @@
-import { signChallenge } from "@toruslabs/base-controllers";
+import { ChainNamespaceType, signChallenge } from "@toruslabs/base-controllers";
 import { generateSiweNonce } from "viem/siwe";
 
 import {
@@ -31,35 +31,49 @@ export abstract class BaseSolanaConnector<T> extends BaseConnector<T> {
       const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0]);
       if (cached) return cached;
 
-      const walletChains = new Set(this.solanaWallet.chains);
-      const currentChainConfig = this.coreOptions.chains.find((c) => {
-        if (c.chainNamespace !== CHAIN_NAMESPACES.SOLANA) return false;
-        const id = getSolanaChainByChainConfig(c);
-        return id != null && walletChains.has(id);
-      });
-      if (!currentChainConfig) {
-        throw WalletInitializationError.invalidParams("No Solana chain in common between the connected wallet and Web3Auth chain configuration");
-      }
-      const { chainId, chainNamespace } = currentChainConfig;
       const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
 
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: generateSiweNonce(),
-        issuedAt: new Date().toISOString(),
-      };
-
-      const challenge = await signChallenge(payload, chainNamespace, authServer);
-      const signedMessage = await walletSignMessage(this.solanaWallet, challenge, accounts[0]);
-      return this.verifyAndAuthorize({ chainNamespace, signedMessage, challenge, authServer });
+      const { challenge, signature, chainNamespace } = await this.generateChallengeAndSign(authServer);
+      return this.verifyAndAuthorize({ chainNamespace, signedMessage: signature, challenge, authServer });
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
   }
 
+  async generateChallengeAndSign(
+    authServerUrl?: string,
+    accounts?: string[]
+  ): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }> {
+    const accountsToUse = accounts || this.solanaWallet.accounts.map((a) => a.address);
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw WalletLoginError.notConnectedError("No accounts found in the connected wallet");
+    }
+    const walletChains = new Set(this.solanaWallet.chains);
+    const currentChainConfig = this.coreOptions.chains.find((c) => {
+      if (c.chainNamespace !== CHAIN_NAMESPACES.SOLANA) return false;
+      const id = getSolanaChainByChainConfig(c);
+      return id != null && walletChains.has(id);
+    });
+    if (!currentChainConfig) {
+      throw WalletInitializationError.invalidParams("No Solana chain in common between the connected wallet and Web3Auth chain configuration");
+    }
+    const { chainId, chainNamespace } = currentChainConfig;
+    const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
+
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(chainId, 16),
+      version: "1",
+      nonce: generateSiweNonce(),
+      issuedAt: new Date().toISOString(),
+    };
+
+    const challenge = await signChallenge(payload, chainNamespace, authServer);
+    const signedMessage = await walletSignMessage(this.solanaWallet, challenge, accountsToUse[0]);
+    return { challenge, signature: signedMessage, chainNamespace };
+  }
+
   async disconnectSession(): Promise<void> {
     super.checkDisconnectionRequirements();
     await this.clearWalletSession();
diff --git a/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts b/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
index 15b5db36a..482f295a6 100644
--- a/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
+++ b/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
@@ -232,15 +232,17 @@ class MetaMaskConnector extends BaseConnector<void> {
 
       this.rehydrated = true;
 
-      this.emit(CONNECTOR_EVENTS.CONNECTED, {
-        connectorName: WALLET_CONNECTORS.METAMASK,
-        reconnected: this.rehydrated,
-        ethereumProvider: this.evmProvider,
-        solanaWallet: this.solanaProvider,
-      } as CONNECTED_EVENT_DATA);
-
-      if (options.getAuthTokenInfo) {
-        await this.getAuthTokenInfo();
+      if (options.autoConnect) {
+        this.emit(CONNECTOR_EVENTS.CONNECTED, {
+          connectorName: WALLET_CONNECTORS.METAMASK,
+          reconnected: this.rehydrated,
+          ethereumProvider: this.evmProvider,
+          solanaWallet: this.solanaProvider,
+        } as CONNECTED_EVENT_DATA);
+
+        if (options.getAuthTokenInfo) {
+          await this.getAuthTokenInfo();
+        }
       }
     } else if (coreStatus === "loaded" || coreStatus === "disconnected") {
       this.status = CONNECTOR_STATUS.READY;
@@ -261,15 +263,15 @@ class MetaMaskConnector extends BaseConnector<void> {
     }
   }
 
-  async connect({ chainId, getAuthTokenInfo }: BaseConnectorLoginParams): Promise<Connection | null> {
+  async connect({ chainId, getAuthTokenInfo, caipAccountIds: caipAccountIdsFromParams }: BaseConnectorLoginParams): Promise<Connection | null> {
     super.checkConnectionRequirements();
 
     await this.ensureInitialized();
-
     const chainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
     if (!chainConfig) throw WalletLoginError.connectionError("Chain config is not available");
 
     const scopes = this.coreOptions.chains.map((c) => getCaipChainId(c) as Scope);
+    const caipAccountIds = caipAccountIdsFromParams || [];
 
     // Skip tracking for rehydration since only new connections are tracked
     const shouldTrack = !this.rehydrated;
@@ -296,7 +298,7 @@ class MetaMaskConnector extends BaseConnector<void> {
         });
 
         // Connect using the multichain client
-        await this.multichainClient.connect(scopes, [], {
+        await this.multichainClient.connect(scopes, caipAccountIds, {
           solana_accountChanged_notifications: true,
         });
 
@@ -389,7 +391,7 @@ class MetaMaskConnector extends BaseConnector<void> {
       this.status = CONNECTOR_STATUS.READY;
     }
     this.rehydrated = false;
-    this.emit(CONNECTOR_EVENTS.DISCONNECTED);
+    this.emit(CONNECTOR_EVENTS.DISCONNECTED, { connector: WALLET_CONNECTORS.METAMASK });
   }
 
   async getAuthTokenInfo(): Promise<AuthTokenInfo> {
@@ -406,9 +408,6 @@ class MetaMaskConnector extends BaseConnector<void> {
 
     if (!activeChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
 
-    this.status = CONNECTOR_STATUS.AUTHORIZING;
-    this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.METAMASK });
-
     const { chainNamespace } = activeChainConfig;
     const accounts =
       chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider
@@ -416,40 +415,17 @@ class MetaMaskConnector extends BaseConnector<void> {
         : this.evmProvider
           ? await this.evmProvider.request<never, string[]>({ method: EVM_METHOD_TYPES.GET_ACCOUNTS })
           : [];
-
     if (accounts && accounts.length > 0) {
       const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0] as string);
       if (cached) return cached;
+    }
 
-      const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(activeChainConfig.chainId, 16),
-        version: "1",
-        nonce: generateSiweNonce(),
-        issuedAt: new Date().toISOString(),
-      };
-
-      const challenge = await signChallenge(payload, chainNamespace, authServer);
-
-      let signedMessage: string;
-      if (chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider) {
-        signedMessage = await walletSignMessage(this.solanaProvider, challenge, accounts[0]);
-      } else if (this.evmProvider) {
-        const hexChallenge = bytesToHexPrefixedString(utf8ToBytes(challenge));
-        signedMessage = await this.evmProvider.request<[string, string], string>({
-          method: EVM_METHOD_TYPES.PERSONAL_SIGN,
-          params: [hexChallenge, accounts[0]],
-        });
-      } else {
-        throw WalletLoginError.notConnectedError("No provider available for signing");
-      }
+    this.status = CONNECTOR_STATUS.AUTHORIZING;
+    this.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: WALLET_CONNECTORS.METAMASK });
 
-      return this.verifyAndAuthorize({ chainNamespace, signedMessage, challenge, authServer });
-    }
-    throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
+    const { challenge, signature } = await this.generateChallengeAndSign(authServer, accounts);
+    return this.verifyAndAuthorize({ chainNamespace, signedMessage: signature, challenge, authServer });
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
@@ -494,6 +470,60 @@ class MetaMaskConnector extends BaseConnector<void> {
     await this.evmClient.switchChain({ chainId: params.chainId as Hex, chainConfiguration });
   }
 
+  public async generateChallengeAndSign(
+    authServerUrl?: string,
+    accounts?: string[]
+  ): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }> {
+    const evmChainId = this.evmProvider?.chainId || this.coreOptions.chains.find((x) => x.chainNamespace === CHAIN_NAMESPACES.EIP155)?.chainId;
+    const isSolanaOnly = !this.evmProvider && !!this.solanaProvider;
+    const activeChainConfig = isSolanaOnly
+      ? this.coreOptions.chains.find((x) => x.chainNamespace === CHAIN_NAMESPACES.SOLANA)
+      : this.evmProvider
+        ? this.coreOptions.chains.find((x) => x.chainId === evmChainId)
+        : undefined;
+    if (!activeChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
+
+    const { chainNamespace } = activeChainConfig;
+    const accountsToUse =
+      accounts ||
+      (chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider
+        ? this.solanaProvider.accounts.map((a) => a.address)
+        : this.evmProvider
+          ? await this.evmProvider.request<never, string[]>({ method: EVM_METHOD_TYPES.GET_ACCOUNTS })
+          : []);
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    }
+
+    const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(activeChainConfig.chainId, 16),
+      version: "1",
+      nonce: generateSiweNonce(),
+      issuedAt: new Date().toISOString(),
+    };
+
+    const challenge = await signChallenge(payload, chainNamespace, authServer);
+
+    let signedMessage: string;
+    if (chainNamespace === CHAIN_NAMESPACES.SOLANA && this.solanaProvider) {
+      signedMessage = await walletSignMessage(this.solanaProvider, challenge, accountsToUse[0]);
+    } else if (this.evmProvider) {
+      const hexChallenge = bytesToHexPrefixedString(utf8ToBytes(challenge));
+      signedMessage = await this.evmProvider.request<[string, string], string>({
+        method: EVM_METHOD_TYPES.PERSONAL_SIGN,
+        params: [hexChallenge, accountsToUse[0]],
+      });
+    } else {
+      throw WalletLoginError.notConnectedError("No provider available for signing");
+    }
+
+    return { challenge, signature: signedMessage, chainNamespace };
+  }
+
   public async enableMFA(): Promise<void> {
     throw new Error("Method Not implemented");
   }
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 2f58cd0a0..c187e7c99 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
@@ -135,6 +135,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
 
     this.connectorOptions.connectorSettings = deepmerge(wc2Settings.connectorSettings || {}, this.connectorOptions.connectorSettings || {});
     const { connectorSettings } = this.connectorOptions;
+
     this.connector = await Client.init(connectorSettings?.walletConnectInitOptions);
     this.wcProvider = new WalletConnectV2Provider({
       config: { chain: chainConfig, chains: this.coreOptions.chains },
@@ -276,7 +277,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
       this.status = CONNECTOR_STATUS.READY;
     }
     this.activeSession = null;
-    this.emit(CONNECTOR_EVENTS.DISCONNECTED);
+    this.emit(CONNECTOR_EVENTS.DISCONNECTED, { connector: WALLET_CONNECTORS.WALLET_CONNECT_V2 });
   }
 
   async getAuthTokenInfo(): Promise<AuthTokenInfo> {
@@ -296,24 +297,47 @@ class WalletConnectV2Connector extends BaseConnector<void> {
       const cached = await this.getCachedOrNullAuthTokenInfo(accounts[0] as string);
       if (cached) return cached;
 
-      const payload = {
-        domain: window.location.origin,
-        uri: window.location.href,
-        address: accounts[0],
-        chainId: parseInt(chainId, 16),
-        version: "1",
-        nonce: generateSiweNonce(),
-        issuedAt: new Date().toISOString(),
-      };
-
       const authServer = citadelServerUrl(this.coreOptions.authBuildEnv);
-      const challenge = await signChallenge(payload, chainNamespace, authServer);
-      const signedMessage = await this._getSignedMessage(challenge, accounts, chainNamespace);
-      return this.verifyAndAuthorize({ chainNamespace, signedMessage: signedMessage as string, challenge, authServer });
+      const { challenge, signature } = await this.generateChallengeAndSign(authServer, accounts);
+      return this.verifyAndAuthorize({ chainNamespace, signedMessage: signature, challenge, authServer });
     }
     throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
   }
 
+  public async generateChallengeAndSign(
+    authServerUrl?: string,
+    accounts?: string[]
+  ): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }> {
+    const { chainId } = this.provider;
+    const currentChainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
+    if (!currentChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
+
+    const { chainNamespace } = currentChainConfig;
+    const accountsToUse =
+      accounts ||
+      (chainNamespace === CHAIN_NAMESPACES.SOLANA && this._solanaWallet
+        ? this._solanaWallet.accounts.map((a) => a.address)
+        : await this.provider.request<never, string[]>({ method: EVM_METHOD_TYPES.GET_ACCOUNTS }));
+    if (!accountsToUse || accountsToUse.length === 0) {
+      throw WalletLoginError.notConnectedError("No accounts found in the connected wallet");
+    }
+
+    const payload = {
+      domain: window.location.origin,
+      uri: window.location.href,
+      address: accountsToUse[0],
+      chainId: parseInt(chainId, 16),
+      version: "1",
+      nonce: generateSiweNonce(),
+      issuedAt: new Date().toISOString(),
+    };
+
+    const authServer = authServerUrl || citadelServerUrl(this.coreOptions.authBuildEnv);
+    const challenge = await signChallenge(payload, chainNamespace, authServer);
+    const signature = await this._getSignedMessage(challenge, accountsToUse, chainNamespace);
+    return { challenge, signature, chainNamespace };
+  }
+
   public async enableMFA(): Promise<void> {
     throw new Error("Method Not implemented");
   }
@@ -368,7 +392,6 @@ class WalletConnectV2Connector extends BaseConnector<void> {
       }
 
       const { uri, approval } = await this.connector.connect(this.connectorOptions.loginSettings);
-
       const qrcodeModal = this.connectorOptions?.connectorSettings?.qrcodeModal;
       // Open QRCode modal if a URI was returned (i.e. we're not connecting with an existing pairing).
       if (uri) {
diff --git a/packages/no-modal/src/index.ts b/packages/no-modal/src/index.ts
index d70dee721..9bd74fdb9 100644
--- a/packages/no-modal/src/index.ts
+++ b/packages/no-modal/src/index.ts
@@ -1,3 +1,4 @@
+export * from "./account-linking";
 export * from "./base";
 export * from "./connectors";
 export * from "./noModal";
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
index 238e90457..8bb0b2413 100644
--- a/packages/no-modal/src/noModal.ts
+++ b/packages/no-modal/src/noModal.ts
@@ -1,3 +1,4 @@
+import { CaipAccountId } from "@metamask/connect-evm";
 import { BUTTON_POSITION, CONFIRMATION_STRATEGY } from "@toruslabs/base-controllers";
 import {
   type AccountAbstractionMultiChainConfig,
@@ -18,6 +19,7 @@ import {
 import { WsEmbedParams } from "@web3auth/ws-embed";
 import deepmerge from "deepmerge";
 
+import { type LinkAccountParams, type LinkAccountResult, UnlinkAccountResult } from "./account-linking";
 import {
   Analytics,
   ANALYTICS_EVENTS,
@@ -38,7 +40,9 @@ import {
   CONNECTOR_NAMESPACES,
   CONNECTOR_STATUS,
   type CONNECTOR_STATUS_TYPE,
+  type ConnectorParams,
   type CustomChainConfig,
+  DISCONNECTED_EVENT_DATA,
   fetchProjectConfig,
   getAaAnalyticsProperties,
   getCaipChainId,
@@ -55,10 +59,13 @@ import {
   type IWeb3Auth,
   type IWeb3AuthCoreOptions,
   IWeb3AuthState,
+  LinkedAccountInfo,
   log,
   LOGIN_MODE,
   LoginModeType,
   type LoginParamMap,
+  normalizeWalletName,
+  parseChainNamespaceFromCitadelResponse,
   PLUGIN_NAMESPACES,
   PLUGIN_STATUS,
   type ProjectConfig,
@@ -77,12 +84,28 @@ import {
   withAbort,
 } from "./base";
 import { deserialize } from "./base/deserialize";
-import { authConnector, type AuthConnectorType } from "./connectors/auth-connector";
+import { AccountLinkingError } from "./base/errors";
+import {
+  assertAuthConnector,
+  authConnector,
+  type AuthConnectorSwitchAccountResult,
+  type AuthConnectorType,
+  isAuthConnector,
+} from "./connectors/auth-connector";
 import { metaMaskConnector } from "./connectors/metamask-connector";
 import { walletServicesPlugin } from "./plugins/wallet-services-plugin";
 import { type AccountAbstractionProvider } from "./providers/account-abstraction-provider";
 import { CommonJRPCProvider } from "./providers/base-provider";
 
+const PRIMARY_CONNECTED_WALLET_KEY = "__primary__";
+
+type ConnectedWalletConnectorState = {
+  connector: IConnector<unknown>;
+  signingProvider: IProvider | null;
+  solanaWallet: Connection["solanaWallet"];
+  connected: boolean;
+};
+
 export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> implements IWeb3Auth {
   readonly coreOptions: IWeb3AuthCoreOptions;
 
@@ -102,19 +125,25 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
   protected consentRequired = false;
 
+  protected projectConfig: ProjectConfig | null = null;
+
   private storage: IStorageAdapter;
 
-  private currentConnection: Connection | null = null;
+  private connectionReconnected = false;
 
-  private currentConnectionReconnected = false;
+  /** Connected wallet state keyed by linked account id; the primary session uses a reserved key. */
+  private connectedWalletConnectorMap: Map<string, ConnectedWalletConnectorState> = new Map();
+
+  private activeWalletConnectorKey = PRIMARY_CONNECTED_WALLET_KEY;
 
   private state: IWeb3AuthState = {
-    connectedConnectorName: null,
+    primaryConnectorName: null,
     cachedConnector: null,
     currentChainId: null,
     idToken: null,
     accessToken: null,
     refreshToken: null,
+    activeAccount: null,
   };
 
   constructor(options: IWeb3AuthCoreOptions, initialState?: Partial<IWeb3AuthState>) {
@@ -151,15 +180,24 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   get connected(): boolean {
-    return Boolean(this.connectedConnector);
+    return Boolean(this.primaryConnector);
   }
 
   get connection(): Connection | null {
-    return this.currentConnection;
+    const connection = this.getConnectedWalletConnectionByKey(this.activeWalletConnectorKey);
+    if (connection) {
+      return connection;
+    }
+
+    if (this.activeWalletConnectorKey !== PRIMARY_CONNECTED_WALLET_KEY) {
+      throw new Error(`Connected connection not found for account "${this.activeWalletConnectorKey}".`);
+    }
+
+    return null;
   }
 
-  get connectedConnectorName(): WALLET_CONNECTOR_TYPE | null {
-    return this.state.connectedConnectorName;
+  get primaryConnectorName(): WALLET_CONNECTOR_TYPE | null {
+    return this.state.primaryConnectorName;
   }
 
   get cachedConnector(): string | null {
@@ -170,8 +208,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     return this.state.currentChainId || this.coreOptions.defaultChainId || this.coreOptions.chains?.[0]?.chainId || null;
   }
 
-  get connectedConnector(): IConnector<unknown> | null {
-    return this.getConnector(this.connectedConnectorName, this.currentChain?.chainNamespace);
+  /**
+   * This is always the primary connector that is connected to the user.
+   */
+  get primaryConnector(): IConnector<unknown> | null {
+    return this.getConnector(this.primaryConnectorName, this.currentChain?.chainNamespace);
   }
 
   get accountAbstractionProvider(): AccountAbstractionProvider | null {
@@ -182,6 +223,34 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     return this.state.idToken || null;
   }
 
+  get accessToken(): string | null {
+    return this.state.accessToken || null;
+  }
+
+  get refreshToken(): string | null {
+    return this.state.refreshToken || null;
+  }
+
+  protected get activeAccount(): LinkedAccountInfo | null {
+    return this.state.activeAccount;
+  }
+
+  /**
+   * This is the current active connector.
+   */
+  private get activeConnector(): IConnector<unknown> | null {
+    const activeConnectedWallet = this.getConnectedWalletConnectorStateByKey(this.activeWalletConnectorKey);
+    if (activeConnectedWallet) {
+      return activeConnectedWallet.connector;
+    }
+
+    if (this.activeWalletConnectorKey !== PRIMARY_CONNECTED_WALLET_KEY) {
+      throw new Error(`Signing connector not found for account "${this.activeWalletConnectorKey}".`);
+    }
+
+    return this.primaryConnector;
+  }
+
   set provider(_: IProvider | null) {
     throw new Error("Not implemented");
   }
@@ -222,6 +291,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       }
 
       // init config
+      this.projectConfig = projectConfig;
       this.initAccountAbstractionConfig(projectConfig);
       this.initChainsConfig(projectConfig);
       await this.initCachedConnectorAndChainId();
@@ -295,13 +365,17 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   public async clearCache(): Promise<void> {
+    this.connectedWalletConnectorMap.clear();
+    this.activeWalletConnectorKey = PRIMARY_CONNECTED_WALLET_KEY;
+    this.connectionReconnected = false;
     await this.setState({
-      connectedConnectorName: null,
+      primaryConnectorName: null,
       cachedConnector: null,
       currentChainId: null,
       idToken: null,
       accessToken: null,
       refreshToken: null,
+      activeAccount: null,
       hasUserConsent: undefined,
     });
   }
@@ -317,19 +391,22 @@ 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 (CONNECTED_STATUSES.includes(this.status) && this.connectedConnector) {
+    if (CONNECTED_STATUSES.includes(this.status)) {
+      const activeConnector = this.activeConnector;
+      if (!activeConnector) throw WalletInitializationError.notReady("Active signing connector is not ready");
+
       // Single-namespace connectors cannot cross namespace boundaries — MULTICHAIN connectors
       // (Auth, WC) enforce their own switchChain policy internally.
       if (
-        this.connectedConnector.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN &&
-        this.currentChain?.chainNamespace !== newChainConfig.chainNamespace
+        activeConnector.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN &&
+        activeConnector.connectorNamespace !== newChainConfig.chainNamespace
       ) {
         throw WalletLoginError.connectionError(
-          `Cannot switch between chain namespaces with ${this.connectedConnector.name}. Disconnect and reconnect with the target chain.`
+          `Cannot switch between chain namespaces with ${activeConnector.name}. Disconnect and reconnect with the target chain.`
         );
       }
 
-      await this.connectedConnector.switchChain(params);
+      await activeConnector.switchChain(params);
       return;
     }
 
@@ -429,7 +506,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       const completeConnection = async () => {
         try {
           // track connection completed event
-          const userInfo = await connector.getUserInfo();
+          const userInfo = await this.getUserInfo();
           this.analytics.track(ANALYTICS_EVENTS.CONNECTION_COMPLETED, {
             ...eventData,
             is_mfa_enabled: userInfo?.isMfaEnabled,
@@ -482,27 +559,46 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async logout(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
-    if (!CAN_LOGOUT_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);
+    if (!CAN_LOGOUT_STATUSES.includes(this.status) || !this.primaryConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.primaryConnector.status === CONNECTOR_STATUS.DISCONNECTING) return;
+    await this.primaryConnector.disconnect(options);
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    log.debug("Getting user info", this.status, this.connectedConnector?.name);
-    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    return this.connectedConnector.getUserInfo();
+    log.debug("Getting user info", this.status, this.primaryConnector?.name);
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.primaryConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    const userInfo = await this.primaryConnector.getUserInfo();
+    return {
+      ...userInfo,
+      linkedAccounts: userInfo.linkedAccounts?.map((account) => ({
+        ...account,
+        active: this.state.activeAccount ? account.id === this.state.activeAccount.id : account.isPrimary,
+      })),
+    };
+  }
+
+  async getLinkedAccounts(): Promise<LinkedAccountInfo[]> {
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.primaryConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+
+    assertAuthConnector(this.primaryConnector, "Linked accounts can only be fetched when connected with the AUTH connector.");
+
+    const linkedAccounts = await this.primaryConnector.getLinkedAccounts();
+    return linkedAccounts.map((account) => ({
+      ...account,
+      active: this.state.activeAccount ? account.id === this.state.activeAccount.id : account.isPrimary,
+    }));
   }
 
   async enableMFA<T>(loginParams?: T): Promise<void> {
-    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH)
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.primaryConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.primaryConnector.name !== WALLET_CONNECTORS.AUTH)
       throw WalletLoginError.unsupportedOperation(`EnableMFA is not supported for this connector.`);
 
-    const authConnector = this.connectedConnector as AuthConnectorType;
-    const trackData = { connector: this.connectedConnector.name, auth_ux_mode: authConnector.authInstance?.options?.uxMode };
+    const authConnector = this.primaryConnector as AuthConnectorType;
+    const trackData = { connector: this.primaryConnector.name, auth_ux_mode: authConnector.authInstance?.options?.uxMode };
     try {
       this.analytics.track(ANALYTICS_EVENTS.MFA_ENABLEMENT_STARTED, trackData);
-      await this.connectedConnector.enableMFA(loginParams);
+      await this.primaryConnector.enableMFA(loginParams);
     } catch (error) {
       this.analytics.track(ANALYTICS_EVENTS.MFA_ENABLEMENT_FAILED, {
         ...trackData,
@@ -513,15 +609,15 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async manageMFA<T>(loginParams?: T): Promise<void> {
-    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
-    if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH)
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.primaryConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.primaryConnector.name !== WALLET_CONNECTORS.AUTH)
       throw WalletLoginError.unsupportedOperation(`ManageMFA is not supported for this connector.`);
 
-    const authConnector = this.connectedConnector as AuthConnectorType;
-    const trackData = { connector: this.connectedConnector.name, auth_ux_mode: authConnector.authInstance?.options?.uxMode };
+    const authConnector = this.primaryConnector as AuthConnectorType;
+    const trackData = { connector: this.primaryConnector.name, auth_ux_mode: authConnector.authInstance?.options?.uxMode };
     try {
       this.analytics.track(ANALYTICS_EVENTS.MFA_MANAGEMENT_SELECTED, trackData);
-      await this.connectedConnector.manageMFA(loginParams);
+      await this.primaryConnector.manageMFA(loginParams);
     } catch (error) {
       this.analytics.track(ANALYTICS_EVENTS.MFA_MANAGEMENT_FAILED, {
         ...trackData,
@@ -532,12 +628,12 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async getAuthTokenInfo(): Promise<Pick<AuthTokenInfo, "idToken">> {
-    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CAN_AUTHORIZE_STATUSES.includes(this.status) || !this.primaryConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
 
-    const trackData = { connector: this.connectedConnector.name };
+    const trackData = { connector: this.primaryConnector.name };
     try {
       this.analytics.track(ANALYTICS_EVENTS.IDENTITY_TOKEN_STARTED, trackData);
-      const authTokenInfo = await this.connectedConnector.getAuthTokenInfo();
+      const authTokenInfo = await this.primaryConnector.getAuthTokenInfo();
       this.analytics.track(ANALYTICS_EVENTS.IDENTITY_TOKEN_COMPLETED, trackData);
       return { idToken: authTokenInfo.idToken };
     } catch (error) {
@@ -553,6 +649,73 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     return this.plugins[name] || null;
   }
 
+  public async switchAccount(account: LinkedAccountInfo): Promise<void> {
+    const authConnector = this.getMainAuthConnector();
+    const switchResult = await authConnector.switchAccount(account, {
+      activeAccount: this.state.activeAccount,
+      currentChainId: this.currentChainId,
+    });
+    if (!switchResult) {
+      return;
+    }
+
+    try {
+      await this.processSwitchAccountResult(authConnector, switchResult, { projectConfig: this.projectConfig ?? undefined });
+      await authConnector.trackSwitchAccountCompleted(switchResult.targetAccount);
+    } catch (error) {
+      await authConnector.trackSwitchAccountFailed(switchResult.targetAccount, error);
+      throw error;
+    }
+  }
+
+  public async linkAccount(params: LinkAccountParams): Promise<LinkAccountResult> {
+    const chainId = this.resolveLinkAccountChainId(params.chainId);
+    const isolatedConnector = await this.createLinkingWalletConnector(params.connectorName, chainId);
+    return this.linkAccountWithConnector(params.connectorName, chainId, isolatedConnector);
+  }
+
+  public async unlinkAccount(address: string): Promise<UnlinkAccountResult> {
+    const authConnector = this.getMainAuthConnector();
+    const linkedAccounts = (await authConnector.getUserInfo()).linkedAccounts ?? [];
+    const targetAccount = this.findLinkedAccountByAddress(linkedAccounts, address);
+
+    if (!targetAccount) {
+      throw AccountLinkingError.accountNotLinked(`Account with address "${address}" is not linked`);
+    }
+
+    if (targetAccount.connector === WALLET_CONNECTORS.AUTH || targetAccount.isPrimary) {
+      throw AccountLinkingError.cannotUnlinkPrimaryAccount();
+    }
+
+    if (this.state.activeAccount?.id === targetAccount.id) {
+      throw AccountLinkingError.cannotUnlinkActiveAccount();
+    }
+
+    const result = await authConnector.unlinkAccount({
+      address,
+      authSessionTokens: {
+        accessToken: this.accessToken,
+        idToken: this.idToken,
+      },
+    });
+    await this.setState({ idToken: result.idToken });
+
+    // disconnect the connector for unlinked account
+    const connectorToDisconnect = this.getConnectedWalletConnector(targetAccount);
+    if (connectorToDisconnect) {
+      try {
+        if (connectorToDisconnect.connected) {
+          await connectorToDisconnect.disconnect({ cleanup: true });
+        }
+      } catch (error) {
+        log.debug(`Failed to disconnect linked account "${targetAccount.id}" during unlink`, error);
+      } finally {
+        this.deleteConnectedWalletConnector(targetAccount);
+      }
+    }
+    return result;
+  }
+
   public setAnalyticsProperties(properties: Record<string, unknown>) {
     this.analytics.setGlobalProperties(properties);
   }
@@ -895,20 +1058,26 @@ 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.primaryConnectorName && this.primaryConnectorName !== data.connectorName) {
+        // Ignore registered connectors that are not the active primary session connector.
+        return;
+      }
+
       if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
       const { ethereumProvider, solanaWallet } = data;
-      const isSolanaOnly = connector.connectorNamespace === CHAIN_NAMESPACES.SOLANA;
-
-      // Set connection and consent status SYNCHRONOUSLY before any await so the
-      // AUTHORIZED handler (which may fire during async work below) can detect the
-      // consent-required state. Create a deferred promise the AUTHORIZED handler
-      // will await to ensure consent userId + pre-approval are resolved first.
-      this.currentConnection = {
-        ethereumProvider: isSolanaOnly ? null : ethereumProvider ? this.commonJRPCProvider : null,
-        solanaWallet: solanaWallet ?? null,
-        connectorName: data.connectorName,
-      };
-      this.currentConnectionReconnected = data.reconnected;
+      // Seed the primary connector synchronously so AUTHORIZED can resolve a connection
+      // even while we are still restoring a previously active linked wallet.
+      this.setConnectedWalletConnectorState(
+        this.buildImmediateConnectedWalletConnectorState({
+          connector,
+          ethereumProvider,
+          solanaWallet,
+          usePrimaryProxy: true,
+        })
+      );
+      this.setActiveWalletConnectorKey();
+      this.connectionReconnected = data.reconnected;
+      const connectedChainId = ethereumProvider?.chainId;
 
       // when ssr is enabled, we need to get the idToken from the connector.
       if (this.coreOptions.ssr) {
@@ -922,63 +1091,99 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
           });
         } catch (error) {
           log.error(error);
-          this.currentConnection = null;
+          this.deleteConnectedWalletConnector();
+          this.setActiveWalletConnectorKey();
           this.status = CONNECTOR_STATUS.ERRORED;
           this.emit(CONNECTOR_EVENTS.ERRORED, error as Web3AuthError, this.loginMode);
           return;
         }
       }
-
-      // setup AA provider if AA is enabled (skip for EIP-7702; 7702 uses EOA + 5792/7702 RPC only)
-      if (ethereumProvider) {
-        let finalProvider = (ethereumProvider as IBaseProvider<unknown>)?.provider || (ethereumProvider as SafeEventEmitterProvider);
-        const { accountAbstractionConfig } = this.coreOptions;
-        const is7702 = accountAbstractionConfig?.smartAccountEipStandard === SMART_ACCOUNT_EIP_STANDARD["EIP_7702"];
-        const isAaSupportedForCurrentChain =
-          this.currentChain?.chainNamespace === CHAIN_NAMESPACES.EIP155 &&
-          accountAbstractionConfig?.chains?.some((chain) => chain.chainId === this.currentChain?.chainId);
-        if (!is7702 && isAaSupportedForCurrentChain && (data.connectorName === WALLET_CONNECTORS.AUTH || this.coreOptions.useAAWithExternalWallet)) {
-          const { accountAbstractionProvider, toEoaProvider } = await import("./providers/account-abstraction-provider");
-          // for embedded wallets, we use ws-embed provider which is AA provider, need to derive EOA provider
-          const eoaProvider: IProvider = data.connectorName === WALLET_CONNECTORS.AUTH ? await toEoaProvider(ethereumProvider) : ethereumProvider;
-          const aaChainIds = new Set(accountAbstractionConfig?.chains?.map((chain) => chain.chainId) || []);
-          const aaProvider = await accountAbstractionProvider({
-            accountAbstractionConfig,
-            provider: eoaProvider,
-            chain: this.currentChain,
-            chains: this.coreOptions.chains.filter((chain) => aaChainIds.has(chain.chainId)),
-            useProviderAsTransport: data.connectorName === WALLET_CONNECTORS.AUTH,
-          });
-          this.aaProvider = aaProvider;
-
-          // if external wallet is used and AA is enabled for external wallets, use AA provider
-          // for embedded wallets, we use ws-embed provider which already supports AA
-          if (data.connectorName !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
-            finalProvider = this.aaProvider;
+      // The following block only hits during rehydration
+
+      const { activeAccount } = this.state;
+      // if the active account is not the primary account, i.e. not `null`, create an isolated connector and connect to the chain
+      if (activeAccount && !activeAccount.isPrimary && activeAccount.connector !== WALLET_CONNECTORS.AUTH) {
+        const accountLinkingConnector = isAuthConnector(connector) ? connector : this.getConnector(WALLET_CONNECTORS.AUTH);
+        assertAuthConnector(accountLinkingConnector, "Account switching requires the AUTH connector to be available.");
+        const targetChainId = accountLinkingConnector.getChainIdForLinkedAccount(activeAccount, connectedChainId);
+        const walletConnector = await this.createIsolatedWalletConnector(activeAccount.connector as WALLET_CONNECTOR_TYPE, targetChainId);
+        let linkedAccountConnection: Connection | null = null;
+
+        if (!this.hasUsableConnectedSwitchConnector(walletConnector)) {
+          linkedAccountConnection = await walletConnector.connect({ chainId: targetChainId });
+          if (!linkedAccountConnection) {
+            throw AccountLinkingError.requestFailed(`Failed to connect isolated connector "${activeAccount.connector}" for account switch.`);
           }
         }
-        this.commonJRPCProvider.updateProviderEngineProxy(finalProvider);
+
+        const connectedWalletState = await this.resolveConnectedWalletConnectorState({
+          connector: walletConnector,
+          ethereumProvider: walletConnector.provider ?? linkedAccountConnection?.ethereumProvider ?? null,
+          solanaWallet: walletConnector.solanaWallet ?? linkedAccountConnection?.solanaWallet ?? null,
+          usePrimaryProxy: false,
+        });
+        this.setConnectedWalletConnectorState(connectedWalletState, activeAccount);
+        this.setActiveWalletConnectorKey(activeAccount);
       }
 
-      await this.setState({ connectedConnectorName: data.connectorName as WALLET_CONNECTOR_TYPE });
+      if (ethereumProvider) {
+        await this.bindPrimaryEthereumSigningProxy(ethereumProvider, data.connectorName);
+      }
+
+      const primaryConnectedWalletState = await this.resolveConnectedWalletConnectorState({
+        connector,
+        ethereumProvider,
+        solanaWallet,
+        usePrimaryProxy: true,
+      });
+      this.setConnectedWalletConnectorState(primaryConnectedWalletState);
+
+      await this.setState({ primaryConnectorName: data.connectorName as WALLET_CONNECTOR_TYPE, currentChainId: connectedChainId });
       this.cacheWallet(data.connectorName);
 
       const isConnectAndSign = this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN;
       if (this.consentRequired && !isConnectAndSign && !this.state.hasUserConsent) {
         this.status = CONNECTOR_STATUS.CONSENT_REQUIRING;
         this.emit(CONNECTOR_EVENTS.CONSENT_REQUIRING);
-        log.debug("consent_requiring", this.status, this.connectedConnectorName);
+        log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
         this.status = CONNECTOR_STATUS.CONNECTED;
-        log.debug("connected", this.status, this.connectedConnectorName);
+        log.debug("connected", this.status, this.primaryConnectorName);
         this.connectToPlugins({ ...data, connector: data.connectorName as WALLET_CONNECTOR_TYPE });
         this.emit(CONNECTOR_EVENTS.CONNECTED, { ...data, loginMode: this.loginMode });
       }
     });
 
-    connector.on(CONNECTOR_EVENTS.DISCONNECTED, async () => {
-      this.currentConnection = null;
-      this.currentConnectionReconnected = false;
+    connector.on(CONNECTOR_EVENTS.DISCONNECTED, async (data?: DISCONNECTED_EVENT_DATA) => {
+      if (this.shouldIgnoreInactiveConnectorEvent(connector, CONNECTOR_EVENTS.DISCONNECTED)) return;
+      const disconnectedConnector = data?.connector;
+      const { activeAccount } = this.state;
+      if (!activeAccount || (activeAccount && activeAccount.isPrimary) || disconnectedConnector === WALLET_CONNECTORS.AUTH) {
+        // If the primary session disconnects, tear down every other connected wallet connector
+        // and clear the entire map.
+        await Promise.all(
+          Array.from(this.connectedWalletConnectorMap.entries()).map(async ([accountId, connectedWallet]) => {
+            if (connectedWallet.connector === connector) {
+              this.connectedWalletConnectorMap.delete(accountId);
+              return;
+            }
+
+            try {
+              if (connectedWallet.connected && connectedWallet.connector.connected) {
+                await connectedWallet.connector.disconnect({ cleanup: true });
+              }
+            } catch (error) {
+              log.debug("Connected wallet connector disconnect on primary disconnect", error);
+            } finally {
+              this.connectedWalletConnectorMap.delete(accountId);
+            }
+          })
+        );
+      }
+
+      this.connectedWalletConnectorMap.clear();
+      this.activeWalletConnectorKey = PRIMARY_CONNECTED_WALLET_KEY;
+      this.connectionReconnected = false;
       // re-setup commonJRPCProvider
       this.commonJRPCProvider.removeAllListeners();
       this.setupCommonJRPCProvider();
@@ -986,11 +1191,11 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       // get back to ready state for rehydrating.
       this.status = CONNECTOR_STATUS.READY;
       const cachedConnector = this.state.cachedConnector;
-      if (this.connectedConnectorName === cachedConnector) {
+      if (this.primaryConnectorName === cachedConnector) {
         await this.clearCache();
       }
 
-      log.debug("disconnected", this.status, this.connectedConnectorName);
+      log.debug("disconnected", this.status, this.primaryConnectorName);
       await Promise.all(
         Object.values(this.plugins).map(async (plugin) => {
           if (!plugin.SUPPORTED_CONNECTORS.includes(connector.name as WALLET_CONNECTOR_TYPE)) return;
@@ -1005,22 +1210,36 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
           });
         })
       );
-      await this.setState({ connectedConnectorName: null, hasUserConsent: undefined });
+      await this.setState({ primaryConnectorName: null, hasUserConsent: undefined, activeAccount: null });
       this.emit(CONNECTOR_EVENTS.DISCONNECTED);
     });
     connector.on(CONNECTOR_EVENTS.CONNECTING, (data) => {
       this.status = CONNECTOR_STATUS.CONNECTING;
       this.emit(CONNECTOR_EVENTS.CONNECTING, data);
-      log.debug("connecting", this.status, this.connectedConnectorName);
+      log.debug("connecting", this.status, this.primaryConnectorName);
     });
     connector.on(CONNECTOR_EVENTS.ERRORED, async (data) => {
+      if (this.shouldIgnoreInactiveConnectorEvent(connector, CONNECTOR_EVENTS.ERRORED)) {
+        log.error("Inactive connector emitted errored event", {
+          connector: connector.name,
+          error: data,
+        });
+        return;
+      }
       this.status = CONNECTOR_STATUS.ERRORED;
       await this.clearCache();
       this.emit(CONNECTOR_EVENTS.ERRORED, data, this.loginMode);
-      log.debug("errored", this.status, this.connectedConnectorName);
+      log.debug("errored", this.status, this.primaryConnectorName);
     });
 
     connector.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, async (error: Web3AuthError) => {
+      if (this.shouldIgnoreInactiveConnectorEvent(connector, CONNECTOR_EVENTS.REHYDRATION_ERROR)) {
+        log.error("Inactive connector emitted rehydration error", {
+          connector: connector.name,
+          error,
+        });
+        return;
+      }
       this.status = CONNECTOR_STATUS.READY;
       await this.clearCache();
       this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
@@ -1032,18 +1251,19 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     });
 
     connector.on(CONNECTOR_EVENTS.CACHE_CLEAR, async (data) => {
+      if (this.shouldIgnoreInactiveConnectorEvent(connector, CONNECTOR_EVENTS.CACHE_CLEAR)) return;
       log.debug("connector cache clear", data);
       await this.clearCache();
     });
 
     connector.on(CONNECTOR_EVENTS.MFA_ENABLED, (isMFAEnabled: boolean) => {
       log.debug("mfa enabled", isMFAEnabled);
-      const authConnector = this.connectedConnector as AuthConnectorType;
+      const authConnector = this.primaryConnector as AuthConnectorType;
 
       // mfa_enabled event is only emitted when using "popup" ux_mode
       // TODO: handle mfa_enabled event when using "redirect" ux_mode
       this.analytics.track(ANALYTICS_EVENTS.MFA_ENABLEMENT_COMPLETED, {
-        connector: this.connectedConnector.name,
+        connector: this.primaryConnector.name,
         auth_ux_mode: authConnector.authInstance?.options?.uxMode,
         is_mfa_enabled: isMFAEnabled,
       });
@@ -1053,7 +1273,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     connector.on(CONNECTOR_EVENTS.AUTHORIZING, (data) => {
       this.status = CONNECTOR_STATUS.AUTHORIZING;
       this.emit(CONNECTOR_EVENTS.AUTHORIZING, data);
-      log.debug("authorizing", this.status, this.connectedConnectorName);
+      log.debug("authorizing", this.status, this.primaryConnectorName);
     });
     connector.on(CONNECTOR_EVENTS.AUTHORIZED, async (data: AUTHORIZED_EVENT_DATA) => {
       await this.setState({
@@ -1062,14 +1282,14 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
         refreshToken: data.authTokenInfo.refreshToken ?? null,
       });
       // if the user has not consented yet, we will ask for consent
-      if (this.consentRequired && this.currentConnection && !this.state.hasUserConsent) {
+      if (this.consentRequired && this.connection && !this.state.hasUserConsent) {
         this.status = CONNECTOR_STATUS.CONSENT_REQUIRING;
         this.emit(CONNECTOR_EVENTS.CONSENT_REQUIRING);
-        log.debug("consent_requiring", this.status, this.connectedConnectorName);
+        log.debug("consent_requiring", this.status, this.primaryConnectorName);
       } else {
         this.status = CONNECTOR_STATUS.AUTHORIZED;
         this.emit(CONNECTOR_EVENTS.AUTHORIZED, data);
-        log.debug("authorized", this.status, this.connectedConnectorName);
+        log.debug("authorized", this.status, this.primaryConnectorName);
       }
     });
   }
@@ -1101,7 +1321,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   protected async completeConsentAcceptance(): Promise<void> {
-    const connection = this.currentConnection;
+    const connection = this.connection;
     if (!connection) {
       throw WalletLoginError.connectionError("Cannot accept consent: no active connection");
     }
@@ -1115,18 +1335,378 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     const isConnectAndSign = this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN;
     if (isConnectAndSign && this.state.idToken) {
       this.status = CONNECTOR_STATUS.AUTHORIZED;
-      log.debug("consent accepted, authorized", this.status, this.connectedConnectorName);
+      log.debug("consent accepted, authorized", this.status, this.primaryConnectorName);
     } else {
       this.status = CONNECTOR_STATUS.CONNECTED;
-      log.debug("consent accepted, connected", this.status, this.connectedConnectorName);
+      log.debug("consent accepted, connected", this.status, this.primaryConnectorName);
     }
 
     // connect to wallet-service plugin
-    if (this.connectedConnectorName === WALLET_CONNECTORS.AUTH) {
-      this.connectToPlugins({ connector: this.connectedConnectorName as WALLET_CONNECTOR_TYPE });
+    if (this.primaryConnectorName === WALLET_CONNECTORS.AUTH) {
+      this.connectToPlugins({ connector: this.primaryConnectorName as WALLET_CONNECTOR_TYPE });
+    }
+
+    this.emit(CONNECTOR_EVENTS.CONSENT_ACCEPTED, { reconnected: this.connectionReconnected });
+  }
+
+  protected resolveLinkAccountChainId(chainId?: string | null): string {
+    const finalChainId = chainId || this.state.currentChainId;
+    if (!finalChainId) {
+      throw AccountLinkingError.walletProofFailed(
+        "No chainId is available. Please specify chainId in LinkAccountParams or ensure the SDK has an active chain."
+      );
+    }
+    return finalChainId;
+  }
+
+  /**
+   * Resolves the chain ID for a switch account operation.
+   * If the account's chain namespace is the same as the current chain namespace, return the current chain ID.
+   * If the account's chain namespace is different from the current chain namespace, return the chainId the account was linked in.
+   *
+   * @param account - The account to switch to.
+   * @param activeChainId - The current active chain ID.
+   * @returns The resolved chain ID.
+   */
+  protected resolveSwitchAccountChainId(account: Pick<LinkedAccountInfo, "chainNamespace">, activeChainId: string): string {
+    const targetChainNamespace = account.chainNamespace ? parseChainNamespaceFromCitadelResponse(account.chainNamespace) : null;
+    if (targetChainNamespace && this.currentChain.chainNamespace === targetChainNamespace) {
+      return this.currentChain.chainId;
+    }
+
+    return activeChainId;
+  }
+
+  protected async createLinkingWalletConnector(
+    connectorName: WALLET_CONNECTOR_TYPE | string,
+    chainId: string,
+    config?: ProjectConfig
+  ): Promise<IConnector<unknown>> {
+    return this.createIsolatedWalletConnector(connectorName, chainId, config);
+  }
+
+  protected async createSwitchingWalletConnector(
+    connectorName: WALLET_CONNECTOR_TYPE | string,
+    chainId: string,
+    config?: ProjectConfig
+  ): Promise<IConnector<unknown>> {
+    return this.createIsolatedWalletConnector(connectorName, chainId, config);
+  }
+
+  protected getConnectedWalletConnector(account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): IConnector<unknown> | null {
+    return this.getConnectedWalletConnectorState(account)?.connector ?? null;
+  }
+
+  protected getConnectedWalletConnectorState(account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): ConnectedWalletConnectorState | null {
+    return this.getConnectedWalletConnectorStateByKey(this.getConnectedWalletConnectorKey(account));
+  }
+
+  protected setConnectedWalletConnectorState(
+    connectedWallet: ConnectedWalletConnectorState,
+    account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null
+  ): void {
+    this.connectedWalletConnectorMap.set(this.getConnectedWalletConnectorKey(account), connectedWallet);
+  }
+
+  protected setConnectedWalletConnector(connector: IConnector<unknown>, account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): void {
+    this.setConnectedWalletConnectorState(
+      {
+        connector,
+        signingProvider: connector.provider,
+        solanaWallet: connector.solanaWallet ?? null,
+        connected: connector.connected || connector.status === CONNECTOR_STATUS.CONNECTED,
+      },
+      account
+    );
+  }
+
+  protected deleteConnectedWalletConnector(account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): void {
+    this.connectedWalletConnectorMap.delete(this.getConnectedWalletConnectorKey(account));
+  }
+
+  protected getConnectedWalletConnection(account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): Connection | null {
+    return this.getConnectedWalletConnectionByKey(this.getConnectedWalletConnectorKey(account));
+  }
+
+  protected hasUsableConnectedSwitchConnector(connector: IConnector<unknown> | null): boolean {
+    if (!connector) return false;
+
+    const isConnected = connector.connected || connector.status === CONNECTOR_STATUS.CONNECTED;
+    return Boolean(isConnected && (connector.provider || connector.solanaWallet));
+  }
+
+  protected setActiveWalletConnectorKey(account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): void {
+    this.activeWalletConnectorKey = this.getConnectedWalletConnectorKey(account);
+  }
+
+  protected getConnectedWalletConnectorKey(account?: Pick<LinkedAccountInfo, "id" | "isPrimary"> | null): string {
+    return !account || account.isPrimary ? PRIMARY_CONNECTED_WALLET_KEY : account.id;
+  }
+
+  protected getConnectedWalletConnectorStateByKey(accountKey: string): ConnectedWalletConnectorState | null {
+    return this.connectedWalletConnectorMap.get(accountKey) ?? null;
+  }
+
+  protected getConnectedWalletConnectionByKey(accountKey: string): Connection | null {
+    const connectedWallet = this.getConnectedWalletConnectorStateByKey(accountKey);
+    if (!connectedWallet) {
+      return null;
     }
 
-    this.emit(CONNECTOR_EVENTS.CONSENT_ACCEPTED, { reconnected: this.currentConnectionReconnected });
+    if (!connectedWallet.signingProvider && !connectedWallet.solanaWallet) {
+      throw new Error(`Connected connector "${connectedWallet.connector.name}" is not ready.`);
+    }
+
+    return this.buildConnectionFromConnectedWalletConnectorState(connectedWallet);
+  }
+
+  protected buildConnectionFromConnectedWalletConnectorState(connectedWallet: ConnectedWalletConnectorState): Connection {
+    return {
+      ethereumProvider: connectedWallet.signingProvider,
+      solanaWallet: connectedWallet.solanaWallet ?? null,
+      connectorName: connectedWallet.connector.name,
+    };
+  }
+
+  protected buildImmediateConnectedWalletConnectorState(params: {
+    connector: IConnector<unknown>;
+    ethereumProvider: IProvider | null;
+    solanaWallet: Connection["solanaWallet"];
+    usePrimaryProxy: boolean;
+  }): ConnectedWalletConnectorState {
+    const { connector, ethereumProvider, solanaWallet, usePrimaryProxy } = params;
+    const isSolanaOnly = connector.connectorNamespace === CHAIN_NAMESPACES.SOLANA;
+
+    const connectedWallet: ConnectedWalletConnectorState = {
+      connector,
+      signingProvider: isSolanaOnly
+        ? null
+        : ethereumProvider
+          ? usePrimaryProxy
+            ? (this.commonJRPCProvider ?? ethereumProvider)
+            : ethereumProvider
+          : null,
+      solanaWallet: solanaWallet ?? null,
+      connected: connector.connected || connector.status === CONNECTOR_STATUS.CONNECTED || connector.status === CONNECTOR_STATUS.AUTHORIZED,
+    };
+    return connectedWallet;
+  }
+
+  protected async resolveConnectedWalletConnectorState(params: {
+    connector: IConnector<unknown>;
+    ethereumProvider: IProvider | null;
+    solanaWallet: Connection["solanaWallet"];
+    usePrimaryProxy: boolean;
+  }): Promise<ConnectedWalletConnectorState> {
+    const { connector, ethereumProvider, solanaWallet, usePrimaryProxy } = params;
+    return this.buildImmediateConnectedWalletConnectorState({
+      connector,
+      ethereumProvider,
+      solanaWallet,
+      usePrimaryProxy,
+    });
+  }
+
+  protected async linkAccountWithConnector(
+    connectorName: WALLET_CONNECTOR_TYPE | string,
+    chainId: string,
+    walletConnector: IConnector<unknown>
+  ): Promise<LinkAccountResult> {
+    const authConnector = this.getMainAuthConnector();
+    const result = await authConnector.linkAccount({
+      connectorName,
+      chainId,
+      walletConnector,
+      authSessionTokens: { accessToken: this.accessToken, idToken: this.idToken },
+    });
+    await this.setState({ idToken: result.idToken });
+    await this.cacheConnectedLinkedWalletConnector(authConnector, walletConnector);
+    return result;
+  }
+
+  protected getMainAuthConnector(): AuthConnectorType {
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.primaryConnector) {
+      throw WalletLoginError.notConnectedError("No wallet is connected. Connect with AUTH before unlinking an account.");
+    }
+
+    const mainConnector = this.primaryConnector;
+    assertAuthConnector(mainConnector, "Account linking is only supported when connected with the AUTH connector.");
+    return mainConnector;
+  }
+
+  /**
+   * Processes the result of a switch account operation.
+   *
+   * - If the target account is a primary account, we will switch back to the primary account.
+   * - If the target account is an external account and already connected (i.e. connector is available with connected state), we will just switch to it without re-connecting again.
+   * - If the target account is an external account and not connected (i.e. connector is not available with connected state), we will create a new isolated connector and connect to it.
+   * @param authConnector - The main auth connector to use.
+   * @param switchResult - The result of the switch account operation.
+   * @param options - The options for the switch account operation.
+   * @returns A promise that resolves when the switch account operation is complete.
+   */
+  protected async processSwitchAccountResult(
+    authConnector: AuthConnectorType,
+    switchResult: AuthConnectorSwitchAccountResult,
+    options: { walletConnector?: IConnector<unknown>; projectConfig?: ProjectConfig } = {}
+  ): Promise<void> {
+    const resolvedSwitchChainId = this.resolveSwitchAccountChainId(switchResult.targetAccount, switchResult.activeChainId);
+
+    if (switchResult.kind === "primary") {
+      const existingPrimaryConnectedWalletState = this.getConnectedWalletConnectorState();
+      const primaryConnectedWalletState =
+        existingPrimaryConnectedWalletState ??
+        (await this.resolveConnectedWalletConnectorState({
+          connector: authConnector,
+          ethereumProvider: switchResult.ethereumProvider,
+          solanaWallet: switchResult.solanaWallet,
+          usePrimaryProxy: true,
+        }));
+      this.setConnectedWalletConnectorState({
+        ...primaryConnectedWalletState,
+        connector: authConnector,
+        signingProvider:
+          primaryConnectedWalletState.signingProvider ??
+          (switchResult.ethereumProvider ? (this.commonJRPCProvider ?? switchResult.ethereumProvider) : null),
+        solanaWallet: switchResult.solanaWallet ?? primaryConnectedWalletState.solanaWallet,
+        connected: authConnector.connected || authConnector.status === CONNECTOR_STATUS.CONNECTED,
+      });
+      this.setActiveWalletConnectorKey();
+    } else {
+      const walletConnector =
+        options.walletConnector ??
+        this.getConnectedWalletConnector(switchResult.targetAccount) ??
+        (await this.createSwitchingWalletConnector(switchResult.targetAccount.connector, resolvedSwitchChainId, options.projectConfig));
+      let linkedAccountConnection: Connection | null = null;
+      try {
+        if (!this.hasUsableConnectedSwitchConnector(walletConnector)) {
+          const switchChainConfig = this.coreOptions.chains.find((c) => c.chainId === resolvedSwitchChainId);
+          if (!switchChainConfig) {
+            throw WalletLoginError.connectionError(`Chain config is not available for chain ${resolvedSwitchChainId}`);
+          }
+          const caipChainId = getCaipChainId(switchChainConfig);
+          const caipAccountId = `${caipChainId}:${switchResult.targetAccount.eoaAddress}` as CaipAccountId;
+          linkedAccountConnection = await walletConnector.connect({ chainId: resolvedSwitchChainId, caipAccountIds: [caipAccountId] });
+          if (!linkedAccountConnection) {
+            throw AccountLinkingError.requestFailed(
+              `Failed to connect isolated connector "${switchResult.targetAccount.connector}" for account switch.`
+            );
+          }
+        }
+
+        await authConnector.assertSwitchAccountConnectorMatchesTarget(walletConnector, switchResult.targetAccount);
+        const connectedWalletState = await this.resolveConnectedWalletConnectorState({
+          connector: walletConnector,
+          ethereumProvider: walletConnector.provider ?? linkedAccountConnection?.ethereumProvider ?? null,
+          solanaWallet: walletConnector.solanaWallet ?? linkedAccountConnection?.solanaWallet ?? null,
+          usePrimaryProxy: false,
+        });
+        this.setConnectedWalletConnectorState(connectedWalletState, switchResult.targetAccount);
+        this.setActiveWalletConnectorKey(switchResult.targetAccount);
+      } catch (error) {
+        throw authConnector.toSwitchAccountConnectorError(switchResult.targetAccount, error);
+      }
+    }
+
+    await this.setCurrentChain(resolvedSwitchChainId);
+    await this.setState({ activeAccount: switchResult.activeAccount });
+    const connection = this.connection;
+    if (!connection) {
+      throw WalletLoginError.connectionError("Failed to resolve the active connection after switching accounts.");
+    }
+    this.emit(CONNECTOR_EVENTS.CONNECTION_UPDATED, {
+      ethereumProvider: connection.ethereumProvider,
+      solanaWallet: connection.solanaWallet,
+      connectorName: connection.connectorName,
+    });
+  }
+
+  private isActiveConnectorEventSource(connector: IConnector<unknown>): boolean {
+    if (!this.primaryConnectorName) return true;
+    const activeConnector = this.primaryConnector;
+    if (activeConnector) return activeConnector === connector;
+    return connector.name === this.primaryConnectorName;
+  }
+
+  private shouldIgnoreInactiveConnectorEvent(connector: IConnector<unknown>, event: string): boolean {
+    if (this.isActiveConnectorEventSource(connector)) return false;
+    log.debug("Ignoring connector lifecycle event from inactive connector", {
+      event,
+      sourceConnector: connector.name,
+      activeConnector: this.primaryConnectorName,
+    });
+    return true;
+  }
+
+  private findLinkedAccountByAddress(linkedAccounts: LinkedAccountInfo[], address: string): LinkedAccountInfo | null {
+    const normalizedAddress = address.toLowerCase();
+    return (
+      linkedAccounts.find((account) => {
+        if (!account.chainNamespace || parseChainNamespaceFromCitadelResponse(account.chainNamespace) !== CHAIN_NAMESPACES.EIP155) {
+          return false;
+        }
+        return account.address?.toLowerCase() === normalizedAddress || account.eoaAddress?.toLowerCase() === normalizedAddress;
+      }) ?? null
+    );
+  }
+
+  private findLinkedAccountByWalletAddress(linkedAccounts: LinkedAccountInfo[], address: string): LinkedAccountInfo | null {
+    return (
+      linkedAccounts.find((account) => {
+        if (!account.chainNamespace) {
+          return false;
+        }
+
+        const chainNamespace = parseChainNamespaceFromCitadelResponse(account.chainNamespace);
+        if (chainNamespace === CHAIN_NAMESPACES.EIP155) {
+          const normalizedAddress = address.toLowerCase();
+          return account.address?.toLowerCase() === normalizedAddress || account.eoaAddress?.toLowerCase() === normalizedAddress;
+        }
+
+        if (chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+          return account.address === address || account.eoaAddress === address;
+        }
+
+        return false;
+      }) ?? null
+    );
+  }
+
+  private async getConnectedWalletAddress(connector: IConnector<unknown>): Promise<string | null> {
+    const solanaAddress = connector.solanaWallet?.accounts?.[0]?.address;
+    if (solanaAddress) {
+      return solanaAddress;
+    }
+
+    if (!connector.provider) {
+      return null;
+    }
+
+    const accounts = await connector.provider.request<never, string[]>({ method: "eth_accounts" });
+    return accounts?.[0] ?? null;
+  }
+
+  private async cacheConnectedLinkedWalletConnector(authConnector: AuthConnectorType, walletConnector: IConnector<unknown>): Promise<void> {
+    try {
+      const connectedWalletAddress = await this.getConnectedWalletAddress(walletConnector);
+      if (!connectedWalletAddress) {
+        return;
+      }
+
+      const linkedAccounts = (await authConnector.getLinkedAccounts()) ?? [];
+      const linkedAccount = this.findLinkedAccountByWalletAddress(linkedAccounts, connectedWalletAddress);
+      if (linkedAccount && !linkedAccount.isPrimary) {
+        const connectedWalletState = await this.resolveConnectedWalletConnectorState({
+          connector: walletConnector,
+          ethereumProvider: walletConnector.provider,
+          solanaWallet: walletConnector.solanaWallet,
+          usePrimaryProxy: false,
+        });
+        this.setConnectedWalletConnectorState(connectedWalletState, linkedAccount);
+      }
+    } catch (error) {
+      log.debug("Failed to cache connected linked wallet connector", error);
+    }
   }
 
   private async cacheWallet(walletName: string): Promise<void> {
@@ -1164,6 +1744,160 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     });
   }
 
+  private async bindPrimaryEthereumSigningProxy(ethereumProvider: IProvider, connectorName: WALLET_CONNECTOR_TYPE | string): Promise<void> {
+    if (!this.commonJRPCProvider) throw WalletInitializationError.notFound(`CommonJrpcProvider not found`);
+    let finalProvider = (ethereumProvider as IBaseProvider<unknown>)?.provider || (ethereumProvider as SafeEventEmitterProvider);
+    const { accountAbstractionConfig } = this.coreOptions;
+    const is7702 = accountAbstractionConfig?.smartAccountEipStandard === SMART_ACCOUNT_EIP_STANDARD["EIP_7702"];
+    const isAaSupportedForCurrentChain =
+      this.currentChain?.chainNamespace === CHAIN_NAMESPACES.EIP155 &&
+      accountAbstractionConfig?.chains?.some((chain) => chain.chainId === this.currentChain?.chainId);
+
+    // setup AA provider if AA is enabled (skip for EIP-7702; 7702 uses EOA + 5792/7702 RPC only)
+    if (!is7702 && isAaSupportedForCurrentChain && (connectorName === WALLET_CONNECTORS.AUTH || this.coreOptions.useAAWithExternalWallet)) {
+      const { accountAbstractionProvider, toEoaProvider } = await import("./providers/account-abstraction-provider");
+      const eoaProvider: IProvider = connectorName === WALLET_CONNECTORS.AUTH ? await toEoaProvider(ethereumProvider) : ethereumProvider;
+      const aaChainIds = new Set(accountAbstractionConfig?.chains?.map((chain) => chain.chainId) || []);
+      const aaProvider = await accountAbstractionProvider({
+        accountAbstractionConfig,
+        provider: eoaProvider,
+        chain: this.currentChain,
+        chains: this.coreOptions.chains.filter((chain) => aaChainIds.has(chain.chainId)),
+        useProviderAsTransport: connectorName === WALLET_CONNECTORS.AUTH,
+      });
+      this.aaProvider = aaProvider;
+
+      if (connectorName !== WALLET_CONNECTORS.AUTH && this.coreOptions.useAAWithExternalWallet) {
+        finalProvider = this.aaProvider;
+      }
+    }
+    this.commonJRPCProvider.updateProviderEngineProxy(finalProvider);
+  }
+
+  private getChainConfigForIsolatedConnector(chainId: string): CustomChainConfig {
+    const chainConfig = this.coreOptions.chains.find((chain) => chain.chainId === chainId);
+    if (!chainConfig) {
+      throw WalletInitializationError.invalidParams(`Chain config is not available for chain ${chainId}`);
+    }
+    return chainConfig;
+  }
+
+  private async resolveInstalledDiscoveredWalletConnector(params: {
+    connectorName: string;
+    chainConfig: CustomChainConfig;
+    config: ConnectorParams;
+    isMipdEnabled: boolean;
+  }): Promise<IConnector<unknown> | null> {
+    const { connectorName, chainConfig, config, isMipdEnabled } = params;
+
+    if (!isBrowser() || !isMipdEnabled) return null;
+
+    if (chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
+      const { createMipd, injectedEvmConnector } = await import("./connectors/injected-evm-connector");
+      const providerDetail = createMipd()
+        .getProviders()
+        .find((detail) => normalizeWalletName(detail.info.name) === connectorName);
+
+      if (providerDetail) {
+        return injectedEvmConnector(providerDetail)(config);
+      }
+      return null;
+    }
+
+    if (chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+      const { createSolanaMipd, hasSolanaWalletStandardFeatures, walletStandardConnector } = await import("./connectors/injected-solana-connector");
+      const wallet = createSolanaMipd()
+        .get()
+        .find((candidate) => hasSolanaWalletStandardFeatures(candidate) && normalizeWalletName(candidate.name) === connectorName);
+
+      if (wallet) {
+        return walletStandardConnector(wallet)(config);
+      }
+    }
+
+    return null;
+  }
+
+  private async resolveDiscoveredWalletConnector(
+    connectorName: string,
+    chainId: string,
+    config: ConnectorParams,
+    effectiveProjectConfig?: ProjectConfig
+  ): Promise<IConnector<unknown>> {
+    const chainConfig = this.getChainConfigForIsolatedConnector(chainId);
+    const isExternalWalletEnabled = Boolean(effectiveProjectConfig?.externalWalletAuth);
+    const isMipdEnabled = isExternalWalletEnabled && (this.coreOptions.multiInjectedProviderDiscovery ?? true);
+    const installedConnector = await this.resolveInstalledDiscoveredWalletConnector({
+      connectorName,
+      chainConfig,
+      config,
+      isMipdEnabled,
+    });
+
+    if (installedConnector) {
+      return installedConnector;
+    }
+
+    const isBuiltInConnectorName = (Object.values(WALLET_CONNECTORS) as string[]).includes(connectorName);
+    const supportsWalletConnectFallback =
+      chainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155 || chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA;
+
+    // Named discovered wallets (for example Phantom) can reuse WalletConnect as a transport fallback
+    // when an injected connector for the target chain namespace is unavailable.
+    if (!isBuiltInConnectorName && isExternalWalletEnabled && supportsWalletConnectFallback) {
+      const { walletConnectV2Connector } = await import("./connectors/wallet-connect-v2-connector");
+      return walletConnectV2Connector()(config);
+    }
+
+    throw AccountLinkingError.unsupportedConnector(
+      `Connector "${connectorName}" does not support automatic wallet linking. ` +
+        `Use ${WALLET_CONNECTORS.METAMASK}, ${WALLET_CONNECTORS.WALLET_CONNECT_V2}, or an installed compatible wallet.`
+    );
+  }
+
+  /**
+   * Create a new connector instance that is NOT registered in this.connectors and NOT
+   * subscribed to the main SDK event loop. Its lifecycle events are therefore isolated
+   * and will not mutate any global SDK state (connectedConnectorName, connection, idToken).
+   */
+  private async createIsolatedWalletConnector(
+    connectorName: WALLET_CONNECTOR_TYPE | string,
+    chainId: string,
+    projectConfig?: ProjectConfig
+  ): Promise<IConnector<unknown>> {
+    const effectiveProjectConfig = projectConfig ?? this.projectConfig ?? undefined;
+    const config: ConnectorParams = {
+      projectConfig: effectiveProjectConfig,
+      coreOptions: this.coreOptions,
+      analytics: this.analytics,
+    };
+
+    let connector: IConnector<unknown>;
+
+    switch (connectorName) {
+      case WALLET_CONNECTORS.METAMASK:
+        connector = metaMaskConnector()(config);
+        break;
+      case WALLET_CONNECTORS.WALLET_CONNECT_V2: {
+        const { walletConnectV2Connector } = await import("./connectors/wallet-connect-v2-connector");
+        connector = walletConnectV2Connector()(config);
+        break;
+      }
+      case WALLET_CONNECTORS.AUTH:
+        throw AccountLinkingError.unsupportedConnector(`Connector "${connectorName}" does not support automatic wallet linking.`);
+      default: {
+        connector = await this.resolveDiscoveredWalletConnector(connectorName, chainId, config, effectiveProjectConfig);
+        break;
+      }
+    }
+
+    // Init the isolated connector WITHOUT subscribing to the main event loop.
+    // This is the key difference from setupConnector(), which calls subscribeToConnectorEvents().
+    // autoConnect: false ensures the connector does not attempt to rehydrate a previous session.
+    await connector.init({ chainId, autoConnect: false });
+    return connector;
+  }
+
   private async setState(newState: Partial<IWeb3AuthState>): Promise<void> {
     this.state = { ...this.state, ...newState };
     await this.storage.set(WEB3AUTH_STATE_STORAGE_KEY, JSON.stringify(this.state));
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 aaddb2cc2..3cb3190a2 100644
--- a/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
+++ b/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
@@ -45,7 +45,7 @@ class WalletServicesPlugin extends SafeEventEmitter implements IPlugin {
   async initWithWeb3Auth(web3auth: IWeb3AuthCore, _whiteLabel?: WhiteLabelData, analytics?: Analytics): Promise<void> {
     if (this.isInitialized) return;
     if (!web3auth) throw WalletServicesPluginError.web3authRequired();
-    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw WalletServicesPluginError.notInitialized();
+    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.primaryConnectorName)) throw WalletServicesPluginError.notInitialized();
     const currentChainConfig = web3auth.currentChain;
     if (!([CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA] as ChainNamespaceType[]).includes(currentChainConfig?.chainNamespace))
       throw WalletServicesPluginError.unsupportedChainNamespace();
diff --git a/packages/no-modal/src/providers/base-provider/baseProvider.ts b/packages/no-modal/src/providers/base-provider/baseProvider.ts
index 2f6c61524..d9b42b44c 100644
--- a/packages/no-modal/src/providers/base-provider/baseProvider.ts
+++ b/packages/no-modal/src/providers/base-provider/baseProvider.ts
@@ -1,4 +1,4 @@
-import { BaseConfig, BaseController, BaseState, createEventEmitterProxy } from "@toruslabs/base-controllers";
+import { BaseConfig, BaseController, BaseState } from "@toruslabs/base-controllers";
 import { JRPCRequest, JRPCResponse, ProviderEvents, rpcErrors, SendCallBack } from "@web3auth/auth";
 
 import {
@@ -24,6 +24,18 @@ export interface BaseProviderConfig extends BaseConfig {
   keyExportEnabled?: boolean;
 }
 
+type ProviderEventName = string | symbol;
+type ProviderEventHandler = (...args: unknown[]) => void;
+type ProviderEventBridge = {
+  handler: ProviderEventHandler;
+  detach?: () => void;
+};
+type RemovableProvider = SafeEventEmitterProvider<ProviderEvents> & {
+  on: (event: ProviderEventName, listener: ProviderEventHandler) => unknown;
+  off?: (event: ProviderEventName, listener: ProviderEventHandler) => void;
+  removeListener?: (event: ProviderEventName, listener: ProviderEventHandler) => void;
+};
+
 export abstract class BaseProvider<C extends BaseProviderConfig, S extends BaseProviderState, P>
   extends BaseController<C, S, BaseProviderEvents<S>>
   implements IBaseProvider<P>
@@ -35,6 +47,10 @@ export abstract class BaseProvider<C extends BaseProviderConfig, S extends BaseP
   // This is to prevent the flag from being overridden by the dashboard config.
   private keyExportFlagSetByCode = false;
 
+  private providerEventBridges = new Map<ProviderEventName, ProviderEventBridge>();
+
+  private providerListenerBridgeRegistered = false;
+
   constructor({ config, state }: { config: C; state?: S }) {
     super({ config, state });
     const { chain } = config;
@@ -111,43 +127,21 @@ export abstract class BaseProvider<C extends BaseProviderConfig, S extends BaseP
   }
 
   public updateProviderEngineProxy(provider: SafeEventEmitterProvider): void {
+    if (this._providerEngineProxy === provider) return;
+
     if (this._providerEngineProxy) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (this._providerEngineProxy as any).setTarget(provider);
-
-      // we want events to propagate from Ethereum provider -> wrapper provider (e.g. CommonJRPC provider) -> SDK -> dapp
-      // ensure that only one handler is added for each event
-      const reEmitHandler = (event: string) => {
-        // skip newListener event
-        if (event === "newListener") return;
-
-        // listen to the event from the Ethereum provider
-        provider.on(event as keyof ProviderEvents, (...args) => {
-          // handle chainChanged event: update chainId state
-          if (event === EIP1193_EVENTS.CHAIN_CHANGED) {
-            const chainId = args[0] as string;
-            this.update({ chainId } as Partial<S>);
-          }
-
-          // re-emit the event
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          this.emit(event as keyof BaseProviderEvents<S>, ...(args as any));
-        });
-      };
-
-      // handle existing events
-      this.eventNames().forEach((event) => {
-        reEmitHandler(event as string);
-      });
-      // handle when a new listener is added
-      this.on("newListener", (event: string) => {
-        // skip if the event already exists
-        if (this.listenerCount(event as keyof BaseProviderEvents<S>) > 0) return;
-        reEmitHandler(event);
-      });
-    } else {
-      this._providerEngineProxy = createEventEmitterProxy<SafeEventEmitterProvider>(provider);
+      // remove all event bridges from the previous provider
+      this.detachProviderEventBridges(this._providerEngineProxy);
     }
+
+    // attach all event bridges to the new provider
+    this._providerEngineProxy = provider;
+    this.ensureProviderListenerBridge();
+
+    this.eventNames().forEach((event) => {
+      this.ensureProviderEventBridge(event as ProviderEventName);
+    });
+    this.attachProviderEventBridges(provider);
   }
 
   public setKeyExportFlag(flag: boolean): void {
@@ -166,6 +160,74 @@ export abstract class BaseProvider<C extends BaseProviderConfig, S extends BaseP
     return this.config.chains.find((chain) => chain.chainId === chainId);
   }
 
+  private ensureProviderListenerBridge(): void {
+    if (this.providerListenerBridgeRegistered) return;
+
+    this.providerListenerBridgeRegistered = true;
+    this.on("newListener", ((event: string | symbol) => {
+      this.ensureProviderEventBridge(event);
+    }) as BaseProviderEvents<S>["newListener"]);
+  }
+
+  private ensureProviderEventBridge(event: ProviderEventName): void {
+    if (event === "newListener" || event === "removeListener" || this.providerEventBridges.has(event)) return;
+
+    const bridge: ProviderEventBridge = {
+      handler: (...args) => {
+        if (event === EIP1193_EVENTS.CHAIN_CHANGED) {
+          const chainId = args[0] as string;
+          this.update({ chainId } as Partial<S>);
+        }
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.emit(event as keyof BaseProviderEvents<S>, ...(args as any));
+      },
+    };
+
+    this.providerEventBridges.set(event, bridge);
+    if (!this._providerEngineProxy) return;
+
+    bridge.detach = this.attachProviderEventBridge(this._providerEngineProxy, event, bridge.handler);
+  }
+
+  private attachProviderEventBridges(provider: SafeEventEmitterProvider): void {
+    this.providerEventBridges.forEach((bridge, event) => {
+      if (bridge.detach) return;
+      bridge.detach = this.attachProviderEventBridge(provider, event, bridge.handler);
+    });
+  }
+
+  private attachProviderEventBridge(
+    provider: SafeEventEmitterProvider,
+    event: ProviderEventName,
+    handler: ProviderEventHandler
+  ): (() => void) | undefined {
+    const removableProvider = provider as RemovableProvider;
+    const maybeDetach = removableProvider.on(event, handler);
+    return typeof maybeDetach === "function"
+      ? () => {
+          maybeDetach();
+        }
+      : undefined;
+  }
+
+  private detachProviderEventBridges(provider: SafeEventEmitterProvider): void {
+    this.providerEventBridges.forEach((bridge, event) => {
+      if (bridge.detach) {
+        bridge.detach();
+      } else {
+        const removableProvider = provider as RemovableProvider;
+        if (typeof removableProvider.removeListener === "function") {
+          removableProvider.removeListener(event, bridge.handler);
+        } else if (typeof removableProvider.off === "function") {
+          removableProvider.off(event, bridge.handler);
+        }
+      }
+
+      bridge.detach = undefined;
+    });
+  }
+
   abstract setupProvider(provider: P, chainId: string): Promise<void>;
 
   abstract switchChain(params: { chainId: string }): Promise<void>;
diff --git a/packages/no-modal/src/react/hooks/useWeb3AuthConnect.ts b/packages/no-modal/src/react/hooks/useWeb3AuthConnect.ts
index 2b0ec8098..fff04c5f4 100644
--- a/packages/no-modal/src/react/hooks/useWeb3AuthConnect.ts
+++ b/packages/no-modal/src/react/hooks/useWeb3AuthConnect.ts
@@ -25,7 +25,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       setConnectorName(null);
     }
     if (isConnected && !connectorName) {
-      setConnectorName(web3Auth.connectedConnectorName);
+      setConnectorName(web3Auth.primaryConnectorName);
     }
   }, [isConnected, connectorName, web3Auth]);
 
@@ -36,7 +36,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       try {
         const provider = await web3Auth.connectTo(connector, params);
         if (provider) {
-          setConnectorName(web3Auth.connectedConnectorName);
+          setConnectorName(web3Auth.primaryConnectorName);
         }
         return provider;
       } catch (error) {
diff --git a/packages/no-modal/src/react/solana/hooks/useSolanaWallet.ts b/packages/no-modal/src/react/solana/hooks/useSolanaWallet.ts
index 89f837bc1..a3afbab76 100644
--- a/packages/no-modal/src/react/solana/hooks/useSolanaWallet.ts
+++ b/packages/no-modal/src/react/solana/hooks/useSolanaWallet.ts
@@ -51,7 +51,7 @@ export const useSolanaWallet = (): IUseSolanaWallet => {
     if (connection?.connectorName !== WALLET_CONNECTORS.AUTH) {
       throw new Error("getPrivateKey is only supported with the Auth connector");
     }
-    const provider = web3Auth.connectedConnector?.provider;
+    const provider = web3Auth.primaryConnector?.provider;
     if (!provider) throw new Error("Provider not available");
     const privateKey = await provider.request<never, string>({ method: SOLANA_METHOD_TYPES.SOLANA_PRIVATE_KEY });
     if (!privateKey) throw new Error("Failed to retrieve private key");
diff --git a/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts b/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
index c03d32a75..04c51c35f 100644
--- a/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
+++ b/packages/no-modal/src/vue/composables/useWeb3AuthConnect.ts
@@ -24,7 +24,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
         connectorName.value = null;
       }
       if (newVal && !connectorName.value) {
-        connectorName.value = web3Auth.value?.connectedConnectorName;
+        connectorName.value = web3Auth.value?.primaryConnectorName;
       }
     },
     { immediate: true }
@@ -36,7 +36,7 @@ export const useWeb3AuthConnect = (): IUseWeb3AuthConnect => {
       error.value = null;
       loading.value = true;
       const localProvider = await web3Auth.value.connectTo(connectorType, loginParams);
-      connectorName.value = web3Auth.value.connectedConnectorName;
+      connectorName.value = web3Auth.value.primaryConnectorName;
       return localProvider;
     } catch (err) {
       log.error("Error connecting", err);
diff --git a/packages/no-modal/src/vue/solana/composables/useSolanaWallet.ts b/packages/no-modal/src/vue/solana/composables/useSolanaWallet.ts
index d32ff0947..c188a6009 100644
--- a/packages/no-modal/src/vue/solana/composables/useSolanaWallet.ts
+++ b/packages/no-modal/src/vue/solana/composables/useSolanaWallet.ts
@@ -73,7 +73,7 @@ export const useSolanaWallet = (): IUseSolanaWallet => {
     if (connection.value?.connectorName !== WALLET_CONNECTORS.AUTH) {
       throw new Error("getPrivateKey is only supported with the Auth connector");
     }
-    const provider = web3Auth.value.connectedConnector?.provider;
+    const provider = web3Auth.value.primaryConnector?.provider;
     if (!provider) throw new Error("Provider not available");
     const privateKey = await provider.request<never, string>({ method: SOLANA_METHOD_TYPES.SOLANA_PRIVATE_KEY });
     if (!privateKey) throw new Error("Failed to retrieve private key");
diff --git a/packages/no-modal/src/vue/useWeb3AuthInnerContextValue.ts b/packages/no-modal/src/vue/useWeb3AuthInnerContextValue.ts
index 37b9bed7a..be1bfb611 100644
--- a/packages/no-modal/src/vue/useWeb3AuthInnerContextValue.ts
+++ b/packages/no-modal/src/vue/useWeb3AuthInnerContextValue.ts
@@ -139,7 +139,7 @@ export function useWeb3AuthInnerContextValue<TWeb3Auth extends IWeb3Auth, TWatch
         if (web3Auth.value!.status === CONNECTOR_STATUS.CONNECTED) {
           if (!isInitialized.value) isInitialized.value = true;
           isConnected.value = true;
-          connection.value = newWeb3Auth.connection;
+          connection.value = web3Auth.value!.connection;
           chainId.value = web3Auth.value!.currentChainId;
           chainNamespace.value = web3Auth.value!.currentChain?.chainNamespace ?? null;
         }
@@ -158,7 +158,7 @@ export function useWeb3AuthInnerContextValue<TWeb3Auth extends IWeb3Auth, TWatch
         if (web3Auth.value!.status === CONNECTOR_STATUS.CONNECTED || web3Auth.value!.status === CONNECTOR_STATUS.AUTHORIZED) {
           if (!isInitialized.value) isInitialized.value = true;
           isConnected.value = true;
-          connection.value = newWeb3Auth.connection;
+          connection.value = web3Auth.value!.connection;
           chainId.value = web3Auth.value!.currentChainId;
           chainNamespace.value = web3Auth.value!.currentChain?.chainNamespace ?? null;
           if (web3Auth.value!.status === CONNECTOR_STATUS.AUTHORIZED) {
@@ -187,6 +187,13 @@ export function useWeb3AuthInnerContextValue<TWeb3Auth extends IWeb3Auth, TWatch
         isMFAEnabled.value = true;
       };
 
+      const connectionUpdatedListener = () => {
+        status.value = web3Auth.value!.status;
+        connection.value = web3Auth.value!.connection;
+        chainId.value = web3Auth.value!.currentChainId;
+        chainNamespace.value = web3Auth.value!.currentChain?.chainNamespace ?? null;
+      };
+
       if (prevWeb3Auth && newWeb3Auth !== prevWeb3Auth) {
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.READY, readyListener);
@@ -197,6 +204,7 @@ export function useWeb3AuthInnerContextValue<TWeb3Auth extends IWeb3Auth, TWatch
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.ERRORED, errorListener);
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
         prevWeb3Auth.removeListener(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+        prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
         if (prevWeb3Auth.loginMode === LOGIN_MODE.MODAL) {
           prevWeb3Auth.removeListener(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
         }
@@ -213,6 +221,7 @@ export function useWeb3AuthInnerContextValue<TWeb3Auth extends IWeb3Auth, TWatch
         newWeb3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, errorListener);
         newWeb3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+        newWeb3Auth.on(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
         if (newWeb3Auth.loginMode === LOGIN_MODE.MODAL) {
           newWeb3Auth.on(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
         }
diff --git a/packages/no-modal/src/vue/wagmi/provider.ts b/packages/no-modal/src/vue/wagmi/provider.ts
index 7fb08fab6..2eae15ca2 100644
--- a/packages/no-modal/src/vue/wagmi/provider.ts
+++ b/packages/no-modal/src/vue/wagmi/provider.ts
@@ -102,6 +102,7 @@ const Web3AuthWagmiProvider = defineComponent({
     const { disconnect } = useWeb3AuthDisconnect();
     const wagmiConfig = useWagmiConfig();
     const { mutate: reconnect } = useReconnect();
+    const lastSyncedWeb3AuthConnection = shallowRef<unknown>(null);
 
     useConnectionEffect({
       onDisconnect: async () => {
@@ -121,15 +122,26 @@ const Web3AuthWagmiProvider = defineComponent({
       [isConnected, connection],
       async () => {
         const newIsConnected = isConnected.value;
-        if (newIsConnected && connection.value?.ethereumProvider) {
-          const connector = await setupConnector(connection.value.ethereumProvider, wagmiConfig);
-          if (!connector) {
-            throw new Error("Failed to setup connector");
+        const newConnection = connection.value;
+        const newEth = newConnection?.ethereumProvider ?? null;
+        if (newIsConnected && newConnection && newEth) {
+          // Linked-account switches can reuse or replace the underlying wallet provider,
+          // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+          if (lastSyncedWeb3AuthConnection.value !== newConnection) {
+            if (getWeb3authConnector(wagmiConfig)) {
+              resetConnectorState(wagmiConfig);
+            }
+            lastSyncedWeb3AuthConnection.value = newConnection;
+            const connector = await setupConnector(newEth, wagmiConfig);
+            if (!connector) {
+              throw new Error("Failed to setup connector");
+            }
+
+            await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+            reconnect();
           }
-
-          await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-          reconnect();
         } else if (!newIsConnected) {
+          lastSyncedWeb3AuthConnection.value = null;
           if (wagmiConfig.state.status === "connected") {
             await disconnectWeb3AuthFromWagmi(wagmiConfig);
           }
diff --git a/packages/no-modal/test/accountLinkingRest.test.ts b/packages/no-modal/test/accountLinkingRest.test.ts
new file mode 100644
index 000000000..e8efbef01
--- /dev/null
+++ b/packages/no-modal/test/accountLinkingRest.test.ts
@@ -0,0 +1,63 @@
+import { post } from "@toruslabs/http-helpers";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { makeAccountLinkingRequest, makeAccountUnlinkingRequest } from "../src/account-linking/rest";
+
+vi.mock("@toruslabs/http-helpers", () => ({
+  post: vi.fn(),
+}));
+
+const mockPost = vi.mocked(post);
+
+const linkPayload = {
+  idToken: "id-token",
+  network: "ethereum" as const,
+  connector: "metamask",
+  message: "Link wallet",
+  signature: {
+    s: "signature",
+    t: "eip191",
+  },
+};
+
+const unlinkPayload = {
+  idToken: "id-token",
+  address: "0x1234",
+  network: "ethereum" as const,
+};
+
+describe("account-linking rest helpers", () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("does not wrap a link failure twice when success is false", async () => {
+    mockPost.mockResolvedValue({
+      success: false,
+      idToken: "next-id-token",
+      linkedAccounts: [],
+    });
+
+    await expect(makeAccountLinkingRequest("https://auth.example.com", "access-token", linkPayload)).rejects.toMatchObject({
+      name: "AccountLinkingError",
+      code: 5401,
+      message: "Account linking request failed. Failed to link account",
+      cause: undefined,
+    });
+  });
+
+  it("does not wrap an unlink failure twice when success is false", async () => {
+    mockPost.mockResolvedValue({
+      success: false,
+      idToken: "next-id-token",
+      linkedAccounts: [],
+    });
+
+    await expect(makeAccountUnlinkingRequest("https://auth.example.com", "access-token", unlinkPayload)).rejects.toMatchObject({
+      name: "AccountLinkingError",
+      code: 5401,
+      message: "Account linking request failed. Failed to unlink account",
+      cause: undefined,
+    });
+  });
+});
diff --git a/packages/no-modal/test/baseProvider.test.ts b/packages/no-modal/test/baseProvider.test.ts
new file mode 100644
index 000000000..798b6c7e0
--- /dev/null
+++ b/packages/no-modal/test/baseProvider.test.ts
@@ -0,0 +1,103 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { type SafeEventEmitterProvider } from "../src/base";
+import { BaseProvider, type BaseProviderConfig, type BaseProviderState } from "../src/providers/base-provider";
+import { createChain } from "./helpers";
+
+class TestBaseProvider extends BaseProvider<BaseProviderConfig, BaseProviderState, never> {
+  async setupProvider(_provider: never, _chainId: string): Promise<void> {}
+
+  async switchChain(_params: { chainId: string }): Promise<void> {}
+
+  protected async lookupNetwork(): Promise<string | void> {
+    return this.chainId;
+  }
+}
+
+class MinimalEip1193Provider {
+  public chainId = "0x1";
+
+  public request = vi.fn(async ({ method }: { method: string }) => `${this.name}:${method}`);
+
+  public sendAsync = vi.fn();
+
+  public send = vi.fn();
+
+  private listeners = new Map<string | symbol, Set<(...args: unknown[]) => void>>();
+
+  constructor(private readonly name: string) {}
+
+  public on(event: string | symbol, listener: (...args: unknown[]) => void): () => void {
+    const listeners = this.listeners.get(event) ?? new Set();
+    listeners.add(listener);
+    this.listeners.set(event, listeners);
+    return () => this.removeListener(event, listener);
+  }
+
+  public once(event: string | symbol, listener: (...args: unknown[]) => void): () => void {
+    const wrappedListener = (...args: unknown[]) => {
+      this.removeListener(event, wrappedListener);
+      listener(...args);
+    };
+    return this.on(event, wrappedListener);
+  }
+
+  public removeListener(event: string | symbol, listener: (...args: unknown[]) => void): void {
+    const listeners = this.listeners.get(event);
+    if (!listeners) return;
+
+    listeners.delete(listener);
+    if (listeners.size === 0) {
+      this.listeners.delete(event);
+    }
+  }
+
+  public emit(event: string | symbol, ...args: unknown[]): void {
+    const listeners = this.listeners.get(event);
+    if (!listeners) return;
+
+    listeners.forEach((listener) => listener(...args));
+  }
+}
+
+describe("BaseProvider", () => {
+  it("rebinds EIP-1193 providers without eventNames and preserves old provider listeners", async () => {
+    const chain = createChain();
+    const provider = new TestBaseProvider({ config: { chain, chains: [chain] } });
+    const oldTarget = new MinimalEip1193Provider("old-target");
+    const newTarget = new MinimalEip1193Provider("new-target");
+
+    const wrapperAccountsChanged = vi.fn();
+    const wrapperChainChanged = vi.fn();
+    const oldTargetNativeListener = vi.fn();
+
+    oldTarget.on("accountsChanged", oldTargetNativeListener);
+
+    provider.updateProviderEngineProxy(oldTarget as unknown as SafeEventEmitterProvider);
+    provider.on("accountsChanged", wrapperAccountsChanged);
+    provider.on("chainChanged", wrapperChainChanged);
+
+    oldTarget.emit("accountsChanged", ["0xold"]);
+    oldTarget.emit("chainChanged", "0x2");
+
+    expect(wrapperAccountsChanged).toHaveBeenCalledTimes(1);
+    expect(oldTargetNativeListener).toHaveBeenCalledTimes(1);
+    expect(wrapperChainChanged).toHaveBeenCalledTimes(1);
+    expect(provider.chainId).toBe("0x2");
+    await expect(provider.request({ method: "eth_accounts" })).resolves.toBe("old-target:eth_accounts");
+
+    expect(() => provider.updateProviderEngineProxy(newTarget as unknown as SafeEventEmitterProvider)).not.toThrow();
+    await expect(provider.request({ method: "eth_accounts" })).resolves.toBe("new-target:eth_accounts");
+
+    oldTarget.emit("accountsChanged", ["0xstale"]);
+    expect(wrapperAccountsChanged).toHaveBeenCalledTimes(1);
+    expect(oldTargetNativeListener).toHaveBeenCalledTimes(2);
+
+    newTarget.emit("accountsChanged", ["0xnew"]);
+    newTarget.emit("chainChanged", "0x3");
+
+    expect(wrapperAccountsChanged).toHaveBeenCalledTimes(2);
+    expect(wrapperChainChanged).toHaveBeenCalledTimes(2);
+    expect(provider.chainId).toBe("0x3");
+  });
+});
diff --git a/packages/no-modal/test/configs/browsers.config.mts b/packages/no-modal/test/configs/browsers.config.mts
index 0ad8a60f6..42345dd4d 100644
--- a/packages/no-modal/test/configs/browsers.config.mts
+++ b/packages/no-modal/test/configs/browsers.config.mts
@@ -10,11 +10,50 @@ const pkgRoot = resolve(__dirname, "../..");
 const repoRoot = resolve(pkgRoot, "../..");
 const viteEnv = loadEnv("test", pkgRoot, "VITE_");
 
+/** Pre-bundle shared runtime deps so the browser runner doesn't re-optimize them mid-run. */
+const noModalOptimizeDepsInclude = [
+  "react",
+  "react-dom",
+  "react-dom/client",
+  "react/jsx-dev-runtime",
+  "vue",
+  "@web3auth/auth",
+  "@toruslabs/http-helpers",
+  "ethers",
+  "jwt-decode",
+  "viem",
+  "viem/siwe",
+  "viem/account-abstraction",
+  "wagmi",
+  "@wagmi/core",
+  "@wagmi/vue",
+  "@wagmi/vue/connectors",
+  "@wagmi/vue/chains",
+  "@walletconnect/sign-client",
+  "@walletconnect/utils",
+  "@metamask/connect-evm",
+  "@metamask/connect-multichain",
+  "@metamask/connect-solana",
+  "@solana/client",
+  "@solana/kit",
+  "@solana/react-hooks",
+  "@solana/wallet-standard-features",
+  "@wallet-standard/app",
+  "@wallet-standard/base",
+  "@wallet-standard/features",
+  "@x402/evm",
+  "@x402/fetch",
+  "@x402/svm",
+];
+
 export default defineConfig({
   root: pkgRoot,
   server: {
     fs: { allow: [repoRoot] },
   },
+  optimizeDeps: {
+    include: noModalOptimizeDepsInclude,
+  },
   define: {
     "process.env.VITE_APP_INFURA_PROJECT_KEY": JSON.stringify(viteEnv.VITE_APP_INFURA_PROJECT_KEY ?? ""),
   },
diff --git a/packages/no-modal/test/helpers.ts b/packages/no-modal/test/helpers.ts
index 3ed07438d..a3d2cfa2e 100644
--- a/packages/no-modal/test/helpers.ts
+++ b/packages/no-modal/test/helpers.ts
@@ -1,14 +1,23 @@
-import { SafeEventEmitter } from "@web3auth/auth";
+import type { Wallet } from "@wallet-standard/base";
+import { type IStorageAdapter, SafeEventEmitter } from "@web3auth/auth";
 
 import {
+  type AuthTokenInfo,
   CHAIN_NAMESPACES,
+  type ChainNamespaceType,
+  type LinkedAccountInfo,
+  type Connection,
   CONNECTOR_CATEGORY,
   CONNECTOR_NAMESPACES,
   CONNECTOR_STATUS,
   type CustomChainConfig,
   type IConnector,
-  type IStorageAdapter,
+  type IProvider,
+  type LinkAccountParams,
+  type LinkAccountResult,
   type ProjectConfig,
+  type UnlinkAccountResult,
+  type UserInfo,
   WALLET_CONNECTORS,
 } from "../src/base";
 
@@ -17,6 +26,8 @@ export function createChain(overrides: Partial<CustomChainConfig> = {}): CustomC
     chainNamespace: CHAIN_NAMESPACES.EIP155,
     chainId: "0x1",
     rpcTarget: "https://rpc.ankr.com/eth",
+    blockExplorerUrl: "https://etherscan.io",
+    logo: "",
     displayName: "Ethereum Mainnet",
     ticker: "ETH",
     tickerName: "Ethereum",
@@ -39,6 +50,7 @@ export function createProjectConfig(overrides: Partial<ProjectConfig> = {}): Pro
 
 export function createMockStorage(): IStorageAdapter & {
   data: Record<string, string>;
+  resetStore(): Promise<void>;
 } {
   const data: Record<string, string> = {};
   return {
@@ -49,6 +61,9 @@ export function createMockStorage(): IStorageAdapter & {
     async set(key: string, value: string) {
       data[key] = value;
     },
+    async remove(key: string) {
+      delete data[key];
+    },
     async resetStore() {
       Object.keys(data).forEach((key) => {
         delete data[key];
@@ -64,19 +79,21 @@ type ConnectorEventMap = {
 };
 
 export class MockConnector extends SafeEventEmitter implements IConnector<unknown> {
-  public connectorNamespace = CHAIN_NAMESPACES.EIP155;
+  public connectorNamespace: IConnector<unknown>["connectorNamespace"] = CHAIN_NAMESPACES.EIP155;
 
-  public name = WALLET_CONNECTORS.AUTH;
+  public name: IConnector<unknown>["name"] = WALLET_CONNECTORS.AUTH;
 
-  public type = CONNECTOR_CATEGORY.IN_APP;
+  public type: IConnector<unknown>["type"] = CONNECTOR_CATEGORY.IN_APP;
 
-  public status = CONNECTOR_STATUS.NOT_READY;
+  public status: IConnector<unknown>["status"] = CONNECTOR_STATUS.NOT_READY;
 
   public isInjected = false;
 
-  public chainConfig = undefined;
+  public chainConfig: CustomChainConfig | undefined = undefined;
+
+  public provider: IProvider | null = null;
 
-  public provider = null;
+  public solanaWallet: Wallet | null = null;
 
   public icon = "";
 
@@ -88,15 +105,19 @@ export class MockConnector extends SafeEventEmitter implements IConnector<unknow
     this.connectEvents = connectEvents;
   }
 
+  get connected() {
+    return this.status === CONNECTOR_STATUS.CONNECTED;
+  }
+
   setConnectEvents(events: ConnectorEventMap) {
     this.connectEvents = events;
   }
 
-  async init() {
+  async init(): Promise<void> {
     this.status = CONNECTOR_STATUS.READY;
   }
 
-  async connect() {
+  async connect(_: { chainId: string }): Promise<Connection | null> {
     this.status = CONNECTOR_STATUS.CONNECTING;
     queueMicrotask(() => {
       if (this.connectEvents.connected) {
@@ -112,26 +133,42 @@ export class MockConnector extends SafeEventEmitter implements IConnector<unknow
     return null;
   }
 
-  async disconnect() {
+  async disconnect(): Promise<void> {
     this.status = CONNECTOR_STATUS.READY;
     this.emit("disconnected");
   }
 
-  async cleanup() {}
+  async cleanup(): Promise<void> {}
 
-  async switchChain() {}
+  async switchChain(): Promise<void> {}
 
-  async getUserInfo() {
+  async getUserInfo(): Promise<Partial<UserInfo>> {
     return {};
   }
 
-  async getAuthTokenInfo() {
+  async getAuthTokenInfo(): Promise<AuthTokenInfo> {
     return { idToken: "id-token" };
   }
 
-  async enableMFA() {}
+  async enableMFA(): Promise<void> {}
+
+  async manageMFA(): Promise<void> {}
+
+  async generateChallengeAndSign(): Promise<{ challenge: string; signature: string; chainNamespace: ChainNamespaceType }> {
+    throw new Error("MockConnector.generateChallengeAndSign is not implemented.");
+  }
+
+  async switchAccount(_: LinkedAccountInfo): Promise<void> {
+    throw new Error("MockConnector.switchAccount is not implemented.");
+  }
+
+  async linkAccount(_: LinkAccountParams): Promise<LinkAccountResult> {
+    throw new Error("MockConnector.linkAccount is not implemented.");
+  }
 
-  async manageMFA() {}
+  async unlinkAccount(_: string): Promise<UnlinkAccountResult> {
+    throw new Error("MockConnector.unlinkAccount is not implemented.");
+  }
 }
 
 export const MULTICHAIN_CONNECTOR_NAMESPACE = CONNECTOR_NAMESPACES.MULTICHAIN;
diff --git a/packages/no-modal/test/noModal.test.ts b/packages/no-modal/test/noModal.test.ts
index a4f987be7..8316eaafd 100644
--- a/packages/no-modal/test/noModal.test.ts
+++ b/packages/no-modal/test/noModal.test.ts
@@ -3,17 +3,20 @@ import { describe, expect, it, vi } from "vitest";
 import {
   CHAIN_NAMESPACES,
   CONNECTED_STATUSES,
+  type Connection,
   CONNECTOR_EVENTS,
   CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   CONNECTOR_NAMESPACES,
   CONNECTOR_STATUS,
   IConnector,
+  type LinkedAccountInfo,
   type WALLET_CONNECTOR_TYPE,
   WALLET_CONNECTORS,
   WalletInitializationError,
   WalletLoginError,
   WEB3AUTH_STATE_STORAGE_KEY,
 } from "../src/base";
+import { authConnector } from "../src/connectors/auth-connector";
 import { Web3AuthNoModal } from "../src/noModal";
 import { createChain, createMockStorage, createProjectConfig, MockConnector, MULTICHAIN_CONNECTOR_NAMESPACE } from "./helpers";
 
@@ -45,6 +48,26 @@ class TestWeb3AuthNoModal extends Web3AuthNoModal {
   public exposeCompleteConsentAcceptance() {
     return this.completeConsentAcceptance();
   }
+
+  public exposeHasUsableConnectedSwitchConnector(connector: IConnector<unknown> | null) {
+    return this.hasUsableConnectedSwitchConnector(connector);
+  }
+
+  public exposeGetConnectedWalletConnector(account?: LinkedAccountInfo | null) {
+    return this.getConnectedWalletConnector(account);
+  }
+
+  public exposeSetConnectedWalletConnector(connector: IConnector<unknown>, account?: LinkedAccountInfo | null) {
+    this.setConnectedWalletConnector(connector, account);
+  }
+
+  public exposeSetActiveWalletConnectorKey(account?: LinkedAccountInfo | null) {
+    this.setActiveWalletConnectorKey(account);
+  }
+
+  public exposeProcessSwitchAccountResult(...args: Parameters<Web3AuthNoModal["processSwitchAccountResult"]>) {
+    return this.processSwitchAccountResult(...args);
+  }
 }
 
 describe("Web3AuthNoModal", () => {
@@ -69,7 +92,7 @@ describe("Web3AuthNoModal", () => {
     const sdk = createSdk(
       {},
       {
-        connectedConnectorName: WALLET_CONNECTORS.AUTH,
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
         cachedConnector: WALLET_CONNECTORS.AUTH,
         currentChainId: "0x1",
         idToken: "id-token",
@@ -78,7 +101,7 @@ describe("Web3AuthNoModal", () => {
       }
     );
     await Promise.resolve();
-    expect(sdk.connectedConnectorName).toBe(WALLET_CONNECTORS.AUTH);
+    expect(sdk.primaryConnectorName).toBe(WALLET_CONNECTORS.AUTH);
     expect(sdk.cachedConnector).toBe(WALLET_CONNECTORS.AUTH);
     expect(sdk.idToken).toBe("id-token");
   });
@@ -106,10 +129,321 @@ describe("Web3AuthNoModal", () => {
     expect(sdk.getConnector(WALLET_CONNECTORS.WALLET_CONNECT_V2, CHAIN_NAMESPACES.SOLANA)).toBe(solana);
   });
 
+  it("treats a missing switch connector as unusable", () => {
+    const sdk = createSdk();
+
+    expect(sdk.exposeHasUsableConnectedSwitchConnector(null)).toBe(false);
+  });
+
+  it("returns the connected wallet provider for an active external account", async () => {
+    const activeAccount = createExternalAccount();
+    const sdk = createSdk(
+      {},
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0x1",
+        activeAccount,
+      }
+    );
+    await Promise.resolve();
+
+    const linkedProvider = { request: vi.fn() };
+    const linkedConnector = new MockConnector({
+      name: WALLET_CONNECTORS.METAMASK,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: linkedProvider as never,
+    } as never);
+    sdk.exposeSetConnectedWalletConnector(linkedConnector, activeAccount);
+    sdk.exposeSetActiveWalletConnectorKey(activeAccount);
+
+    expect(sdk.connection).toEqual({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: linkedProvider,
+      solanaWallet: null,
+    });
+  });
+
+  it("switches to a linked account without rebinding the AUTH provider proxy", async () => {
+    const sdk = createSdk(
+      {},
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0x1",
+      }
+    );
+    await Promise.resolve();
+
+    const activeAccount = createExternalAccount();
+    const authProvider = { chainId: "0x1" };
+    const linkedProvider = { request: vi.fn() };
+    const updateProviderEngineProxy = vi.fn();
+    const primaryConnector = new MockConnector({
+      name: WALLET_CONNECTORS.AUTH,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: authProvider as never,
+    } as never);
+    const walletConnector = new MockConnector({
+      name: WALLET_CONNECTORS.METAMASK,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: linkedProvider as never,
+    } as never);
+    const authConnector = {
+      assertSwitchAccountConnectorMatchesTarget: vi.fn().mockResolvedValue(undefined),
+      toSwitchAccountConnectorError: vi.fn((_: unknown, error: unknown) => error),
+    } as never;
+
+    sdk.exposeSetConnectedWalletConnector(primaryConnector);
+    (sdk as unknown as { commonJRPCProvider: { updateProviderEngineProxy: ReturnType<typeof vi.fn> } }).commonJRPCProvider = {
+      updateProviderEngineProxy,
+    };
+
+    const connectionUpdatedListener = vi.fn();
+    sdk.on(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+
+    await sdk.exposeProcessSwitchAccountResult(
+      authConnector,
+      {
+        kind: "external",
+        targetAccount: activeAccount,
+        activeAccount,
+        activeChainId: "0x1",
+      },
+      { walletConnector }
+    );
+
+    expect(updateProviderEngineProxy).not.toHaveBeenCalled();
+    expect(sdk.exposeGetConnectedWalletConnector()).toBe(primaryConnector);
+    expect(connectionUpdatedListener).toHaveBeenCalledWith({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: linkedProvider,
+      solanaWallet: null,
+    });
+    expect(sdk.connection).toEqual({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: linkedProvider,
+      solanaWallet: null,
+    });
+  });
+
+  it("keeps the preferred chain when the linked account stays in the same namespace", () => {
+    const connector = authConnector()({
+      projectConfig: createProjectConfig(),
+      coreOptions: {
+        clientId: "test-client-id",
+        web3AuthNetwork: "sapphire_devnet",
+        chains: [
+          createChain({
+            chainId: "0xaa36a7",
+            rpcTarget: "https://rpc.ankr.com/eth_sepolia",
+            displayName: "Ethereum Sepolia",
+          }),
+          createChain(),
+        ],
+      } as never,
+      analytics: { track: vi.fn() } as never,
+    }) as unknown as {
+      getChainIdForLinkedAccount: (account: Pick<LinkedAccountInfo, "chainNamespace" | "connector">, preferredChainId?: string | null) => string;
+    };
+
+    expect(connector.getChainIdForLinkedAccount(createExternalAccount({ chainNamespace: "evm" }), "0xaa36a7")).toBe("0xaa36a7");
+  });
+
+  it("switches back to the primary account without rebinding the AUTH provider proxy", async () => {
+    const activeAccount = createExternalAccount();
+    const sdk = createSdk(
+      {},
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0x1",
+      }
+    );
+    await Promise.resolve();
+
+    const authProvider = { chainId: "0x1" };
+    const linkedProvider = { request: vi.fn() };
+    const updateProviderEngineProxy = vi.fn();
+    const authConnector = new MockConnector({
+      name: WALLET_CONNECTORS.AUTH,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: authProvider as never,
+    } as never);
+    const linkedConnector = new MockConnector({
+      name: WALLET_CONNECTORS.METAMASK,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: linkedProvider as never,
+    } as never);
+
+    (sdk as unknown as { connectors: MockConnector[] }).connectors = [authConnector];
+    (sdk as unknown as { commonJRPCProvider: { updateProviderEngineProxy: ReturnType<typeof vi.fn> } }).commonJRPCProvider = {
+      updateProviderEngineProxy,
+    };
+    sdk.exposeSubscribeToConnectorEvents(authConnector);
+
+    authConnector.emit(CONNECTOR_EVENTS.CONNECTED, {
+      connectorName: WALLET_CONNECTORS.AUTH,
+      ethereumProvider: authProvider,
+      solanaWallet: null,
+      reconnected: false,
+    });
+
+    await vi.waitFor(() => {
+      expect(updateProviderEngineProxy).toHaveBeenCalledWith(authProvider);
+    });
+
+    sdk.exposeSetConnectedWalletConnector(linkedConnector, activeAccount);
+    sdk.exposeSetActiveWalletConnectorKey(activeAccount);
+    updateProviderEngineProxy.mockClear();
+
+    const connectionUpdatedListener = vi.fn();
+    sdk.on(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
+
+    await sdk.exposeProcessSwitchAccountResult(
+      authConnector as never,
+      {
+        kind: "primary",
+        targetAccount: createPrimaryAccount(),
+        activeAccount: null,
+        activeChainId: "0x1",
+        connectorName: WALLET_CONNECTORS.AUTH,
+        connectorNamespace: CHAIN_NAMESPACES.EIP155,
+        ethereumProvider: authProvider as never,
+        solanaWallet: null,
+      },
+      {}
+    );
+
+    expect(updateProviderEngineProxy).not.toHaveBeenCalled();
+    expect(connectionUpdatedListener).toHaveBeenCalledWith({
+      connectorName: WALLET_CONNECTORS.AUTH,
+      ethereumProvider: (sdk as unknown as { commonJRPCProvider: unknown }).commonJRPCProvider,
+      solanaWallet: null,
+    });
+    expect(sdk.connection).toEqual({
+      connectorName: WALLET_CONNECTORS.AUTH,
+      ethereumProvider: (sdk as unknown as { commonJRPCProvider: unknown }).commonJRPCProvider,
+      solanaWallet: null,
+    });
+  });
+
+  it("reuses the current chain when switching linked accounts within the same namespace", async () => {
+    const sdk = createSdk(
+      {
+        chains: [
+          createChain({
+            chainId: "0xaa36a7",
+            rpcTarget: "https://rpc.ankr.com/eth_sepolia",
+            displayName: "Ethereum Sepolia",
+          }),
+          createChain(),
+        ],
+      },
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0xaa36a7",
+      }
+    );
+    await Promise.resolve();
+
+    const targetAccount = createExternalAccount({ chainNamespace: "evm" });
+    const linkedProvider = { request: vi.fn() };
+    const walletConnector = new MockConnector({
+      name: WALLET_CONNECTORS.METAMASK,
+      status: CONNECTOR_STATUS.READY,
+    } as never);
+    walletConnector.connect = vi.fn().mockResolvedValue({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: linkedProvider as never,
+      solanaWallet: null,
+    });
+
+    const authConnector = {
+      assertSwitchAccountConnectorMatchesTarget: vi.fn().mockResolvedValue(undefined),
+      toSwitchAccountConnectorError: vi.fn((_: unknown, error: unknown) => error),
+    } as never;
+
+    await sdk.exposeProcessSwitchAccountResult(
+      authConnector,
+      {
+        kind: "external",
+        targetAccount,
+        activeAccount: targetAccount,
+        activeChainId: "0x1",
+      },
+      { walletConnector }
+    );
+
+    expect(walletConnector.connect).toHaveBeenCalledWith(
+      expect.objectContaining({
+        chainId: "0xaa36a7",
+      })
+    );
+    expect(sdk.currentChainId).toBe("0xaa36a7");
+  });
+
+  it("rehydrates an active linked account without rebinding the AUTH proxy to the linked wallet", async () => {
+    const activeAccount = createExternalAccount();
+    const sdk = createSdk(
+      {},
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        cachedConnector: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0x1",
+        activeAccount,
+      }
+    );
+    await Promise.resolve();
+
+    const authProvider = { chainId: "0x1" };
+    const linkedProvider = { request: vi.fn() };
+    const updateProviderEngineProxy = vi.fn();
+    const authConnector = new MockConnector({
+      name: WALLET_CONNECTORS.AUTH,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: authProvider as never,
+    } as never) as MockConnector & {
+      getChainIdForLinkedAccount: ReturnType<typeof vi.fn>;
+    };
+    const linkedConnector = new MockConnector({
+      name: WALLET_CONNECTORS.METAMASK,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: linkedProvider as never,
+    } as never);
+    authConnector.getChainIdForLinkedAccount = vi.fn().mockReturnValue("0x1");
+
+    (sdk as unknown as { connectors: MockConnector[] }).connectors = [authConnector];
+    (sdk as unknown as { commonJRPCProvider: { updateProviderEngineProxy: ReturnType<typeof vi.fn> } }).commonJRPCProvider = {
+      updateProviderEngineProxy,
+    };
+    vi.spyOn(sdk as unknown as { createIsolatedWalletConnector: () => Promise<MockConnector> }, "createIsolatedWalletConnector").mockResolvedValue(
+      linkedConnector
+    );
+    sdk.exposeSubscribeToConnectorEvents(authConnector);
+
+    authConnector.emit(CONNECTOR_EVENTS.CONNECTED, {
+      connectorName: WALLET_CONNECTORS.AUTH,
+      ethereumProvider: authProvider,
+      solanaWallet: null,
+      reconnected: true,
+    });
+
+    await vi.waitFor(() => {
+      expect(updateProviderEngineProxy).toHaveBeenCalledWith(authProvider);
+    });
+
+    expect(updateProviderEngineProxy).not.toHaveBeenCalledWith(linkedProvider);
+    expect(sdk.exposeGetConnectedWalletConnector()).toBe(authConnector);
+    expect(sdk.exposeGetConnectedWalletConnector(activeAccount)).toBe(linkedConnector);
+    expect(sdk.connection).toEqual({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: linkedProvider,
+      solanaWallet: null,
+    });
+  });
+
   it("clearCache resets persisted state fields", async () => {
     const sdk = createSdk();
     (sdk as unknown as { state: Record<string, unknown> }).state = {
-      connectedConnectorName: WALLET_CONNECTORS.AUTH,
+      primaryConnectorName: WALLET_CONNECTORS.AUTH,
       cachedConnector: WALLET_CONNECTORS.AUTH,
       currentChainId: "0x1",
       idToken: "id-token",
@@ -119,7 +453,7 @@ describe("Web3AuthNoModal", () => {
 
     await sdk.clearCache();
     const state = (sdk as unknown as { state: Record<string, unknown> }).state;
-    expect(state.connectedConnectorName).toBeNull();
+    expect(state.primaryConnectorName).toBeNull();
     expect(state.cachedConnector).toBeNull();
     expect(state.currentChainId).toBeNull();
     expect(state.idToken).toBeNull();
@@ -127,6 +461,84 @@ describe("Web3AuthNoModal", () => {
     expect(state.refreshToken).toBeNull();
   });
 
+  it("ignores inactive connector lifecycle events without clearing the active AUTH session", async () => {
+    const sdk = createSdk(
+      {},
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        cachedConnector: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0x1",
+        idToken: "id-token",
+        accessToken: "access-token",
+        refreshToken: "refresh-token",
+        activeAccount: null,
+      }
+    );
+    await Promise.resolve();
+    sdk.status = CONNECTED_STATUSES[0];
+
+    const authProvider = { request: vi.fn() };
+    const primaryConnection: Connection = {
+      connectorName: WALLET_CONNECTORS.AUTH,
+      ethereumProvider: authProvider as never,
+      solanaWallet: null,
+    };
+
+    const authConnector = new MockConnector({
+      name: WALLET_CONNECTORS.AUTH,
+      status: CONNECTOR_STATUS.CONNECTED,
+      provider: authProvider as never,
+    } as never);
+    const inactiveConnector = new MockConnector({ name: WALLET_CONNECTORS.METAMASK } as never);
+    sdk.exposeSetConnectedWalletConnector(authConnector);
+    (sdk as unknown as { connectors: MockConnector[] }).connectors = [authConnector, inactiveConnector];
+    sdk.exposeSubscribeToConnectorEvents(authConnector);
+    sdk.exposeSubscribeToConnectorEvents(inactiveConnector);
+
+    inactiveConnector.emit(CONNECTOR_EVENTS.ERRORED, WalletLoginError.connectionError("User rejected request"));
+    inactiveConnector.emit(CONNECTOR_EVENTS.DISCONNECTED, { connector: WALLET_CONNECTORS.METAMASK });
+    inactiveConnector.emit(CONNECTOR_EVENTS.CACHE_CLEAR);
+    inactiveConnector.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, WalletLoginError.connectionError("rehydration failed"));
+    await Promise.resolve();
+
+    expect(sdk.status).toBe(CONNECTED_STATUSES[0]);
+    expect(sdk.primaryConnectorName).toBe(WALLET_CONNECTORS.AUTH);
+    expect(sdk.idToken).toBe("id-token");
+    expect(sdk.accessToken).toBe("access-token");
+    expect(sdk.refreshToken).toBe("refresh-token");
+    expect(sdk.connection).toEqual(primaryConnection);
+  });
+
+  it("still clears the session when the active connector errors", async () => {
+    const sdk = createSdk(
+      {},
+      {
+        primaryConnectorName: WALLET_CONNECTORS.AUTH,
+        cachedConnector: WALLET_CONNECTORS.AUTH,
+        currentChainId: "0x1",
+        idToken: "id-token",
+        accessToken: "access-token",
+        refreshToken: "refresh-token",
+      }
+    );
+    await Promise.resolve();
+    sdk.status = CONNECTED_STATUSES[0];
+
+    const authConnector = new MockConnector({ name: WALLET_CONNECTORS.AUTH } as never);
+    (sdk as unknown as { connectors: MockConnector[] }).connectors = [authConnector];
+    sdk.exposeSubscribeToConnectorEvents(authConnector);
+
+    authConnector.emit(CONNECTOR_EVENTS.ERRORED, WalletLoginError.connectionError("active connector failed"));
+    await vi.waitFor(() => {
+      expect(sdk.status).toBe(CONNECTOR_STATUS.ERRORED);
+    });
+
+    expect(sdk.primaryConnectorName).toBeNull();
+    expect(sdk.idToken).toBeNull();
+    expect(sdk.accessToken).toBeNull();
+    expect(sdk.refreshToken).toBeNull();
+  });
+
   it("initChainsConfig merges project and user chains with user precedence", () => {
     const sdk = createSdk({
       chains: [createChain({ chainId: "0x1", displayName: "User chain", rpcTarget: "https://user-rpc.example.com" })],
@@ -189,7 +601,7 @@ describe("Web3AuthNoModal", () => {
     } as never);
     (sdk as unknown as { connectors: MockConnector[] }).connectors = [connector];
     (sdk as unknown as { state: Record<string, unknown> }).state = {
-      connectedConnectorName: WALLET_CONNECTORS.METAMASK,
+      primaryConnectorName: WALLET_CONNECTORS.METAMASK,
       cachedConnector: null,
       currentChainId: "0x1",
       idToken: null,
@@ -212,44 +624,52 @@ describe("Web3AuthNoModal", () => {
 
   it("connectTo resolves in connect-only mode on CONNECTED", async () => {
     const sdk = createSdk({ initialAuthenticationMode: CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_ONLY });
-    (sdk as unknown as { commonJRPCProvider: Record<string, unknown> }).commonJRPCProvider = {};
-    const connector = new MockConnector({ name: WALLET_CONNECTORS.METAMASK } as never, { connected: { connectorName: WALLET_CONNECTORS.METAMASK } });
-    connector.connect = vi.fn(async () => {
-      sdk.emit(CONNECTOR_EVENTS.CONNECTED, {
+    const ethereumProvider = { request: vi.fn() };
+    const commonJRPCProvider = { updateProviderEngineProxy: vi.fn() };
+    (sdk as unknown as { commonJRPCProvider: Record<string, unknown> }).commonJRPCProvider = commonJRPCProvider;
+    const connector = new MockConnector({ name: WALLET_CONNECTORS.METAMASK } as never, {
+      connected: {
         connectorName: WALLET_CONNECTORS.METAMASK,
-        ethereumProvider: null,
+        ethereumProvider: ethereumProvider as never,
         solanaWallet: null,
         reconnected: false,
-        loginMode: "no-modal",
-      });
-      return null;
+      },
     });
     (sdk as unknown as { connectors: MockConnector[] }).connectors = [connector];
+    sdk.exposeSubscribeToConnectorEvents(connector);
 
-    await expect(sdk.connectTo(WALLET_CONNECTORS.METAMASK)).resolves.toBeNull();
+    await expect(sdk.connectTo(WALLET_CONNECTORS.METAMASK)).resolves.toEqual({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: commonJRPCProvider as never,
+      solanaWallet: null,
+    });
   });
 
   it("connectTo resolves in connect-and-sign mode after CONNECTED and AUTHORIZED", async () => {
     const sdk = createSdk({ initialAuthenticationMode: CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN });
-    (sdk as unknown as { commonJRPCProvider: Record<string, unknown> }).commonJRPCProvider = {};
-    const connector = new MockConnector({ name: WALLET_CONNECTORS.METAMASK } as never);
-    connector.connect = vi.fn(async () => {
-      sdk.emit(CONNECTOR_EVENTS.CONNECTED, {
+    const ethereumProvider = { request: vi.fn() };
+    const commonJRPCProvider = { updateProviderEngineProxy: vi.fn() };
+    (sdk as unknown as { commonJRPCProvider: Record<string, unknown> }).commonJRPCProvider = commonJRPCProvider;
+    const connector = new MockConnector({ name: WALLET_CONNECTORS.METAMASK } as never, {
+      connected: {
         connectorName: WALLET_CONNECTORS.METAMASK,
-        ethereumProvider: undefined,
-        solanaWallet: undefined,
+        ethereumProvider: ethereumProvider as never,
+        solanaWallet: null,
         reconnected: false,
-        loginMode: "modal",
-      });
-      sdk.emit(CONNECTOR_EVENTS.AUTHORIZED, {
+      },
+      authorized: {
         authTokenInfo: { idToken: "id-token" },
-        connector: "",
-      });
-      return null;
+        connector: WALLET_CONNECTORS.METAMASK,
+      },
     });
     (sdk as unknown as { connectors: MockConnector[] }).connectors = [connector];
+    sdk.exposeSubscribeToConnectorEvents(connector);
 
-    await expect(sdk.connectTo(WALLET_CONNECTORS.METAMASK)).resolves.toBeNull();
+    await expect(sdk.connectTo(WALLET_CONNECTORS.METAMASK)).resolves.toEqual({
+      connectorName: WALLET_CONNECTORS.METAMASK,
+      ethereumProvider: commonJRPCProvider as never,
+      solanaWallet: null,
+    });
   });
 
   it("connectTo rejects on ERRORED event", async () => {
@@ -414,7 +834,7 @@ describe("Web3AuthNoModal", () => {
   it("checkIfAutoConnect returns true only for cached matching connector", () => {
     const sdk = createSdk();
     (sdk as unknown as { state: Record<string, unknown> }).state = {
-      connectedConnectorName: null,
+      primaryConnectorName: null,
       cachedConnector: WALLET_CONNECTORS.METAMASK,
       currentChainId: "0x1",
       idToken: null,
@@ -447,3 +867,35 @@ function createSdk(overrides: Record<string, unknown> = {}, initialState?: Recor
     initialState as never
   );
 }
+
+function createExternalAccount(overrides: Partial<LinkedAccountInfo> = {}): LinkedAccountInfo {
+  return {
+    id: "linked-account-id",
+    isPrimary: false,
+    active: true,
+    accountType: "external_wallet",
+    address: "0x1234567890abcdef1234567890abcdef12345678",
+    eoaAddress: "0x1234567890abcdef1234567890abcdef12345678",
+    connector: WALLET_CONNECTORS.METAMASK,
+    authConnectionId: null,
+    groupedAuthConnectionId: null,
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    ...overrides,
+  };
+}
+
+function createPrimaryAccount(overrides: Partial<LinkedAccountInfo> = {}): LinkedAccountInfo {
+  return {
+    id: "primary-account-id",
+    isPrimary: true,
+    active: true,
+    accountType: "social",
+    address: "0xabcdefabcdefabcdefabcdefabcdefabcdefabcd",
+    eoaAddress: "0xabcdefabcdefabcdefabcdefabcdefabcdefabcd",
+    connector: WALLET_CONNECTORS.AUTH,
+    authConnectionId: "web3auth",
+    groupedAuthConnectionId: null,
+    chainNamespace: CHAIN_NAMESPACES.EIP155,
+    ...overrides,
+  };
+}