diff --git a/demo/vue-app-new/src/components/AccountLinkingSection.vue b/demo/vue-app-new/src/components/AccountLinkingSection.vue
index 66d6af0d6..12f8ef50d 100644
--- a/demo/vue-app-new/src/components/AccountLinkingSection.vue
+++ b/demo/vue-app-new/src/components/AccountLinkingSection.vue
@@ -52,6 +52,15 @@ const onLinkAccount = async () => {
   }
 };
 
+const onLinkAccountWithPicker = async () => {
+  lastUnlinkedAddress.value = null;
+  const result = await linkAccount();
+  if (result) {
+    await props.refreshUserInfo();
+    props.printToConsole("Link Wallet (picker) Result", result);
+  }
+};
+
 const onUnlinkAccount = async (address: string) => {
   lastUnlinkedAddress.value = null;
   pendingUnlinkAddress.value = address;
@@ -110,7 +119,9 @@ const getWalletCardClasses = (account: ConnectedAccountInfo): string => {
           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">
+      <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: {{ connectedWallets.length }}
       </p>
     </div>
@@ -183,7 +194,11 @@ const getWalletCardClasses = (account: ConnectedAccountInfo): string => {
         >
           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}`">
+        <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>
 
@@ -229,7 +244,7 @@ const getWalletCardClasses = (account: ConnectedAccountInfo): string => {
     <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">
+  <Card v-if="showLinkWallet" class="mb-2 !h-auto gap-2 overflow-hidden px-4 py-4 flex flex-col" :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.
@@ -238,5 +253,6 @@ const getWalletCardClasses = (account: ConnectedAccountInfo): string => {
       <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>
+    <Button :loading="accountLinkingLoading" block size="xs" pill @click="onLinkAccountWithPicker">Link with another wallet (modal picker)</Button>
   </Card>
 </template>
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
index 7b9bc86b8..66d06eb12 100644
--- a/packages/modal/src/modalManager.ts
+++ b/packages/modal/src/modalManager.ts
@@ -89,6 +89,10 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
   private removeAccountLinkingResetOnCloseListener: (() => void) | null = null;
 
+  private accountLinkingPickerResolver: ((connectorName: WALLET_CONNECTOR_TYPE | string) => void) | null = null;
+
+  private removeAccountLinkingPickerCloseListener: (() => void) | null = null;
+
   constructor(options: Web3AuthOptions, initialState?: Partial<IWeb3AuthState>) {
     super(options, initialState);
     this.options = { ...options };
@@ -282,10 +286,12 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
         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 this.runNonWalletConnectAccountAction(switchResult.targetAccount.connector, () =>
+          super.processSwitchAccountResult(authConnector, switchResult, {
+            walletConnector: isExistingConnectorConnected && existingConnector ? existingConnector : undefined,
+            projectConfig,
+          })
+        );
         await authConnector.trackSwitchAccountCompleted(switchResult.targetAccount);
         return;
       }
@@ -297,10 +303,12 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       );
 
       if (connectorToSwitchTo.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
-        await super.processSwitchAccountResult(authConnector, switchResult, {
-          walletConnector: connectorToSwitchTo,
-          projectConfig,
-        });
+        await this.runNonWalletConnectAccountAction(switchResult.targetAccount.connector, () =>
+          super.processSwitchAccountResult(authConnector, switchResult, {
+            walletConnector: connectorToSwitchTo,
+            projectConfig,
+          })
+        );
         await authConnector.trackSwitchAccountCompleted(switchResult.targetAccount);
         return;
       }
@@ -312,22 +320,18 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     }
   }
 
-  public async linkAccount(params: LinkAccountParams): Promise<LinkAccountResult> {
-    const chainId = this.resolveLinkAccountChainId(params.chainId);
-    const connectorToLink = await this.prepareAccountLinkingConnector(params.connectorName, chainId);
+  public async linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult> {
+    // Pre-flight: ensure user is connected via AUTH so we fail fast before opening the modal.
+    this.getMainAuthConnector();
 
-    if (connectorToLink.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
-      return super.linkAccountWithConnector(params.connectorName, chainId, connectorToLink);
+    const chainId = this.resolveLinkAccountChainId(params?.chainId);
+
+    if (!params?.connectorName) {
+      const pickedConnector = await this.pickWalletForAccountLinking(chainId);
+      return this.linkAccountWithChosenConnector(pickedConnector, chainId);
     }
 
-    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,
-    });
+    return this.linkAccountWithChosenConnector(params.connectorName, chainId);
   }
 
   protected startAccountLinkingModalSession(params: {
@@ -819,6 +823,13 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     connector: WALLET_CONNECTOR_TYPE | string;
     loginParams: { chainNamespace: ChainNamespaceType };
   }): Promise<void> => {
+    // If the modal is in account-linking picker mode, hand off the selected connector
+    // to the linking flow instead of running the regular login `connectTo`.
+    if (this.accountLinkingPickerResolver) {
+      const resolver = this.accountLinkingPickerResolver;
+      resolver(params.connector);
+      return;
+    }
     try {
       const connector = this.getConnector(params.connector as WALLET_CONNECTOR_TYPE, params.loginParams?.chainNamespace);
       // auto-connect WalletConnect in background to generate QR code URI without interfering with user's selected connection
@@ -1019,6 +1030,96 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     }
   }
 
+  private async linkAccountWithChosenConnector(connectorName: WALLET_CONNECTOR_TYPE | string, chainId: string): Promise<LinkAccountResult> {
+    const connectorToLink = await this.prepareAccountLinkingConnector(connectorName, chainId);
+
+    if (connectorToLink.name !== WALLET_CONNECTORS.WALLET_CONNECT_V2) {
+      return this.runNonWalletConnectAccountAction(connectorName, () => super.linkAccountWithConnector(connectorName, chainId, connectorToLink), {
+        connector: connectorToLink,
+      });
+    }
+
+    return this.runWalletConnectV2AccountAction({
+      connector: connectorToLink,
+      connectParams: { chainId, isAccountLinking: true },
+      onConnected: async (connector) => ({
+        result: await super.linkAccountWithConnector(connectorName, chainId, connector),
+      }),
+      intent: ACCOUNT_LINKING_INTENT.LINK,
+    });
+  }
+
+  private pickWalletForAccountLinking(chainId: string): Promise<WALLET_CONNECTOR_TYPE | string> {
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    if (this.accountLinkingPickerResolver) {
+      throw AccountLinkingError.requestFailed("Another account linking picker is already in progress.");
+    }
+
+    this.loginModal.startAccountLinkingPicker({ chainId });
+
+    return new Promise<WALLET_CONNECTOR_TYPE | string>((resolve, reject) => {
+      const cleanup = () => {
+        this.accountLinkingPickerResolver = null;
+        if (this.removeAccountLinkingPickerCloseListener) {
+          this.removeAccountLinkingPickerCloseListener();
+          this.removeAccountLinkingPickerCloseListener = null;
+        }
+        this.loginModal.endAccountLinkingPicker();
+      };
+
+      const handleVisibility = (visible: boolean) => {
+        if (visible) return;
+        cleanup();
+        reject(WalletLoginError.popupClosed("User closed the modal"));
+      };
+
+      this.accountLinkingPickerResolver = (connector) => {
+        cleanup();
+        resolve(connector);
+      };
+      this.on(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
+      this.removeAccountLinkingPickerCloseListener = () => {
+        this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
+      };
+    });
+  }
+
+  private async runNonWalletConnectAccountAction<T>(
+    connectorName: WALLET_CONNECTOR_TYPE | string,
+    fn: () => Promise<T>,
+    options: { connector?: IConnector<unknown> } = {}
+  ): Promise<T> {
+    if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
+    const displayName = CONNECTOR_NAMES[connectorName as WALLET_CONNECTOR_TYPE] || connectorName;
+    this.loginModal.startConnectingLoader({ connector: connectorName, connectorName: displayName });
+
+    // Forward the AUTHORIZING event from the linking wallet connector to the modal so we can
+    // swap the loader from "connecting" to "authorizing" while the user reviews the signature
+    // request inside their wallet.
+    const handleAuthorizing = () => this.loginModal?.markLoaderAuthorizing();
+    if (options.connector) {
+      options.connector.on(CONNECTOR_EVENTS.AUTHORIZING, handleAuthorizing);
+    }
+
+    try {
+      const result = await fn();
+      this.loginModal.endConnectingLoader({ success: true });
+      return result;
+    } catch (error) {
+      let message = (error as Error)?.message;
+      if (error instanceof AccountLinkingError) {
+        const isUnlink = error.code >= 5406 && error.code <= 5408;
+        message = isUnlink ? `[${error.code}] Account unlinking failed` : `[${error.code}] Account linking failed`;
+      }
+      this.loginModal.endConnectingLoader({ success: false, errorMessage: message });
+      throw error;
+    } finally {
+      if (options.connector) {
+        options.connector.removeListener(CONNECTOR_EVENTS.AUTHORIZING, handleAuthorizing);
+      }
+    }
+  }
+
   private subscribeToAccountLinkingConnectorEvents(connector: IConnector<unknown>): () => void {
     const handleConnecting = () => {
       this.updateAccountLinkingModalSession({
diff --git a/packages/modal/src/ui/components/Loader/Loader.tsx b/packages/modal/src/ui/components/Loader/Loader.tsx
index 200368c67..3f37d8da4 100644
--- a/packages/modal/src/ui/components/Loader/Loader.tsx
+++ b/packages/modal/src/ui/components/Loader/Loader.tsx
@@ -23,7 +23,7 @@ function ConnectingStatus(props: ConnectingStatusType) {
   );
 
   return (
-    <div className="wta:flex wta:h-full wta:flex-1 wta:flex-col wta:items-center wta:justify-center wta:gap-y-4">
+    <div className="wta:flex wta:h-full wta:flex-1 wta:flex-col wta:items-center wta:justify-center wta:gap-y-4 wta:pt-6">
       <SpinnerLoader width={95} height={95}>
         {providerIcon}
       </SpinnerLoader>
@@ -47,7 +47,7 @@ function ConnectingStatus(props: ConnectingStatusType) {
 function ConnectedStatus(props: ConnectedStatusType) {
   const { message } = props;
   return (
-    <div className="wta:flex wta:flex-col wta:items-center wta:gap-y-2">
+    <div className="wta:flex wta:flex-col wta:items-center wta:gap-y-2 wta:pt-6">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" className="w3a--connected-logo">
         <path
           fill="currentColor"
@@ -69,7 +69,7 @@ function ConnectedStatus(props: ConnectedStatusType) {
 function ErroredStatus(props: ErroredStatusType) {
   const { message } = props;
   return (
-    <div className="wta:flex wta:flex-col wta:items-center wta:gap-y-2">
+    <div className="wta:flex wta:flex-col wta:items-center wta:gap-y-2 wta:pt-6">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20" className="w3a--error-logo">
         <path
           fill="currentColor"
diff --git a/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx b/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx
index 43a5a3c98..151bf786e 100644
--- a/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx
+++ b/packages/modal/src/ui/containers/AccountLinking/AccountLinking.tsx
@@ -85,13 +85,13 @@ function AccountLinking(props: AccountLinkingProps) {
   ]);
 
   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 className="wta:flex wta:flex-1 wta:flex-col wta:gap-y-4">
+      <div className="wta:flex wta:items-center wta:justify-center">
+        <p className="wta:text-base wta:font-medium wta:text-app-gray-900 wta:dark: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 className="wta:rounded-2xl wta:border wta:border-app-gray-200 wta:bg-app-gray-50 wta:p-4 wta:dark:border-app-gray-700 wta:dark:bg-app-gray-800">
+          <p className="wta:text-center wta:text-sm wta:text-app-gray-700 wta:dark:text-app-gray-200">{accountLinkingMessage}</p>
         </div>
       ) : (
         <ConnectWalletQrCode
@@ -104,7 +104,7 @@ function AccountLinking(props: AccountLinkingProps) {
         />
       )}
       {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>
+        <p className="wta:text-center wta:text-sm wta:text-app-gray-500 wta:dark:text-app-gray-300">{accountLinkingMessage}</p>
       )}
     </div>
   );
diff --git a/packages/modal/src/ui/containers/ConnectWallet/ConnectWallet.tsx b/packages/modal/src/ui/containers/ConnectWallet/ConnectWallet.tsx
index 64f7f276e..1f3b40df8 100644
--- a/packages/modal/src/ui/containers/ConnectWallet/ConnectWallet.tsx
+++ b/packages/modal/src/ui/containers/ConnectWallet/ConnectWallet.tsx
@@ -246,6 +246,14 @@ function ConnectWallet(props: ConnectWalletProps) {
     } else {
       // show QR code if wallet connect v2 is supported
       if (button.hasWalletConnect) {
+        // In account-linking picker mode, hand off to the WC v2 account-linking flow in
+        // modalManager (via the picker resolver in onExternalWalletLogin) instead of showing
+        // the regular inline QR — the regular QR uses a connector owned by the login flow,
+        // which is not what we want for linking.
+        if (modalState.accountLinking.pickerActive) {
+          handleExternalWalletClick({ connector: button.name });
+          return;
+        }
         setSelectedButton(button);
         setSelectedWallet(true);
         setCurrentPage(CONNECT_WALLET_PAGES.SELECTED_WALLET);
@@ -292,6 +300,7 @@ function ConnectWallet(props: ConnectWalletProps) {
         onBackClick={handleBack}
         currentPage={currentPage}
         selectedButton={selectedButton}
+        isLinking={modalState.accountLinking.pickerActive}
       />
       {/* Body */}
       {selectedWallet ? (
diff --git a/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.tsx b/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.tsx
index e45ed17e3..570b837d5 100644
--- a/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.tsx
+++ b/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.tsx
@@ -5,7 +5,7 @@ import i18n from "../../../localeImport";
 import { ConnectWalletHeaderProps } from "./ConnectWalletHeader.type";
 
 function ConnectWalletHeader(props: ConnectWalletHeaderProps) {
-  const { hideBackButton, disableBackButton, onBackClick, currentPage, selectedButton } = props;
+  const { hideBackButton, disableBackButton, onBackClick, currentPage, selectedButton, isLinking } = props;
   const [t] = useTranslation(undefined, { i18n });
 
   const handleBack = () => {
@@ -44,7 +44,9 @@ function ConnectWalletHeader(props: ConnectWalletHeaderProps) {
         {currentPage === CONNECT_WALLET_PAGES.SELECTED_WALLET
           ? selectedButton?.displayName
           : currentPage === CONNECT_WALLET_PAGES.CONNECT_WALLET
-            ? t("modal.connectYourWallet")
+            ? isLinking
+              ? t("modal.linkYourWallet")
+              : t("modal.connectYourWallet")
             : currentPage}
       </p>
       <div className="wta:z-[-1] wta:size-5" />
diff --git a/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.type.ts b/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.type.ts
index af71b20c6..58aa1d214 100644
--- a/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.type.ts
+++ b/packages/modal/src/ui/containers/ConnectWallet/ConnectWalletHeader/ConnectWalletHeader.type.ts
@@ -6,4 +6,5 @@ export interface ConnectWalletHeaderProps {
   currentPage: string;
   selectedButton: ExternalButton;
   hideBackButton?: boolean;
+  isLinking?: boolean;
 }
diff --git a/packages/modal/src/ui/containers/Root/Root.tsx b/packages/modal/src/ui/containers/Root/Root.tsx
index a8afe5998..d6bf756f7 100644
--- a/packages/modal/src/ui/containers/Root/Root.tsx
+++ b/packages/modal/src/ui/containers/Root/Root.tsx
@@ -1,6 +1,6 @@
 import { WALLET_CONNECTORS, type WalletRegistryItem } from "@web3auth/no-modal";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { twMerge } from "tailwind-merge";
+import { useTranslation } from "react-i18next";
 
 import Footer from "../../components/Footer/Footer";
 import Loader from "../../components/Loader";
@@ -10,6 +10,7 @@ import { useModalState } from "../../context/ModalStateContext";
 import { RootProvider } from "../../context/RootContext";
 import { useWidget } from "../../context/WidgetContext";
 import { type ExternalButton, MODAL_STATUS } from "../../interfaces";
+import i18n from "../../localeImport";
 import AccountLinking from "../AccountLinking";
 import ConnectWallet from "../ConnectWallet";
 import Login from "../Login";
@@ -19,6 +20,7 @@ import RootBodySheets from "./RootBodySheets/RootBodySheets";
 function RootContent(props: RootProps) {
   const { onCloseLoader } = props;
 
+  const [t] = useTranslation(undefined, { i18n });
   const { modalState, shouldShowLoginPage, showPasswordLessInput, areSocialLoginsVisible } = useModalState();
   const { deviceDetails, uiConfig, isConnectAndSignAuthenticationMode, handleMobileVerifyConnect, handleAcceptConsent, handleDeclineConsent } =
     useWidget();
@@ -194,7 +196,11 @@ function RootContent(props: RootProps) {
     return !isWalletConnectAccountLinkingVisible && modalState.status !== MODAL_STATUS.INITIALIZED;
   }, [isWalletConnectAccountLinkingVisible, modalState.status]);
 
-  const isConsentRequiringStatus = modalState.status === MODAL_STATUS.CONSENT_REQUIRING;
+  const loaderMessage = useMemo(() => {
+    const message = modalState.postLoadingMessage;
+    if (!message) return undefined;
+    return i18n.exists(message) ? t(message) : message;
+  }, [modalState.postLoadingMessage, t]);
 
   return (
     <div className="wta:relative wta:flex wta:flex-col">
@@ -205,19 +211,14 @@ function RootContent(props: RootProps) {
         }}
       >
         <div className="w3a--modal-curtain" />
-        <div
-          ref={contentRef}
-          className={twMerge(
-            "wta:relative wta:flex wta:flex-col wta:p-6",
-            isShowLoader && !isConsentRequiringStatus ? "wta:flex-1" : "wta:flex-none"
-          )}
-        >
+        <div ref={contentRef} className="wta:relative wta:flex wta:flex-none wta:flex-col wta:p-6">
           {/* Content */}
           {isShowLoader ? (
             <Loader
               connector={modalState.detailedLoaderConnector}
               connectorName={modalState.detailedLoaderConnectorName}
               modalStatus={modalState.status}
+              message={loaderMessage}
               onClose={onCloseLoader}
               isConnectAndSignAuthenticationMode={isConnectAndSignAuthenticationMode}
               externalWalletsConfig={modalState.externalWalletsConfig}
@@ -233,6 +234,7 @@ function RootContent(props: RootProps) {
               {isWalletConnectAccountLinkingVisible && <AccountLinking allExternalWallets={allExternalWallets} />}
               {/* Login Screen */}
               {!isWalletConnectAccountLinkingVisible &&
+                !modalState.accountLinking.pickerActive &&
                 modalState.currentPage === PAGES.LOGIN_OPTIONS &&
                 shouldShowLoginPage &&
                 modalState.status === MODAL_STATUS.INITIALIZED && (
@@ -245,7 +247,7 @@ function RootContent(props: RootProps) {
               {/* Connect Wallet Screen */}
               {!isWalletConnectAccountLinkingVisible &&
                 modalState.currentPage === PAGES.WALLET_LIST &&
-                (!shouldShowLoginPage || isExternalWalletModeOnly) &&
+                (!shouldShowLoginPage || isExternalWalletModeOnly || modalState.accountLinking.pickerActive) &&
                 modalState.status === MODAL_STATUS.INITIALIZED && (
                   <ConnectWallet
                     allRegistryButtons={allRegistryButtons}
diff --git a/packages/modal/src/ui/i18n/amharic.json b/packages/modal/src/ui/i18n/amharic.json
index 67df6d64d..f0ac4ba84 100644
--- a/packages/modal/src/ui/i18n/amharic.json
+++ b/packages/modal/src/ui/i18n/amharic.json
@@ -6,6 +6,7 @@
     "allChains": "ሁሉም ቼኖች",
     "connect-wallet.more-wallets": "ተጨማሪ ዋሌቶች",
     "connectYourWallet": "ዋሌትዎን ያገናኙ",
+    "linkYourWallet": "ዋሌትዎን ያያይዙ",
     "errors-invalid-email": "የተሳሳተ ኢሜይል",
     "errors-invalid-number": "የተሳሳተ የስልክ ቁጥር",
     "errors-invalid-number-email": "የተሳሳተ ኢሜይል ወይም የስልክ ቁጥር",
diff --git a/packages/modal/src/ui/i18n/dutch.json b/packages/modal/src/ui/i18n/dutch.json
index 85ee885ad..93fa8905f 100644
--- a/packages/modal/src/ui/i18n/dutch.json
+++ b/packages/modal/src/ui/i18n/dutch.json
@@ -6,6 +6,7 @@
     "allChains": "Alle ketens",
     "connect-wallet.more-wallets": "Meer portemonnees",
     "connectYourWallet": "Uw portemonnee verbinden",
+    "linkYourWallet": "Uw portemonnee koppelen",
     "errors-invalid-email": "Ongeldig e-mailadres",
     "errors-invalid-number": "Ongeldig telefoonnummer",
     "errors-invalid-number-email": "Ongeldig e-mailadres of telefoonnummer",
diff --git a/packages/modal/src/ui/i18n/english.json b/packages/modal/src/ui/i18n/english.json
index e0ae3ae8b..d56eb5337 100644
--- a/packages/modal/src/ui/i18n/english.json
+++ b/packages/modal/src/ui/i18n/english.json
@@ -6,6 +6,7 @@
     "allChains": "All Chains",
     "connect-wallet.more-wallets": "More Wallets",
     "connectYourWallet": "Connect your wallet",
+    "linkYourWallet": "Link your wallet",
     "errors-invalid-email": "Invalid Email",
     "errors-invalid-number": "Invalid Phone Number",
     "errors-invalid-number-email": "Invalid Email or Phone Number",
diff --git a/packages/modal/src/ui/i18n/french.json b/packages/modal/src/ui/i18n/french.json
index e8c31efb4..03a050f48 100644
--- a/packages/modal/src/ui/i18n/french.json
+++ b/packages/modal/src/ui/i18n/french.json
@@ -6,6 +6,7 @@
     "allChains": "Toutes les chaînes",
     "connect-wallet.more-wallets": "Plus de portefeuilles",
     "connectYourWallet": "Connectez votre portefeuille",
+    "linkYourWallet": "Liez votre portefeuille",
     "errors-invalid-email": "E-mail invalide",
     "errors-invalid-number": "Numéro de téléphone invalide",
     "errors-invalid-number-email": "Adresse e-mail ou numéro de téléphone invalide",
diff --git a/packages/modal/src/ui/i18n/german.json b/packages/modal/src/ui/i18n/german.json
index 69ca5399a..af5901490 100644
--- a/packages/modal/src/ui/i18n/german.json
+++ b/packages/modal/src/ui/i18n/german.json
@@ -6,6 +6,7 @@
     "allChains": "Alle Kettens",
     "connect-wallet.more-wallets": "Mehr Wallets",
     "connectYourWallet": "Ihre Wallet verbinden",
+    "linkYourWallet": "Ihre Wallet verknüpfen",
     "errors-invalid-email": "Ungültige E-Mail",
     "errors-invalid-number": "Ungültige Telefonnummer",
     "errors-invalid-number-email": "Ungültige E-Mail-Adresse oder Telefonnummer",
diff --git a/packages/modal/src/ui/i18n/japanese.json b/packages/modal/src/ui/i18n/japanese.json
index f05fc4988..48824ee42 100644
--- a/packages/modal/src/ui/i18n/japanese.json
+++ b/packages/modal/src/ui/i18n/japanese.json
@@ -6,6 +6,7 @@
     "allChains": "すべてのチェーン",
     "connect-wallet.more-wallets": "ウォレットをもっと見る",
     "connectYourWallet": "ウォレットを接続",
+    "linkYourWallet": "ウォレットをリンク",
     "errors-invalid-email": "無効な電子メール",
     "errors-invalid-number": "無効な電話番号",
     "errors-invalid-number-email": "無効なメールアドレスまたは電話番号",
diff --git a/packages/modal/src/ui/i18n/korean.json b/packages/modal/src/ui/i18n/korean.json
index cc628496b..b91b2d3a0 100644
--- a/packages/modal/src/ui/i18n/korean.json
+++ b/packages/modal/src/ui/i18n/korean.json
@@ -6,6 +6,7 @@
     "allChains": "모든 체인",
     "connect-wallet.more-wallets": "더 많은 지갑",
     "connectYourWallet": "지갑 연결",
+    "linkYourWallet": "지갑 연동",
     "errors-invalid-email": "유효하지 않은 이메일",
     "errors-invalid-number": "유효하지 않은 전화번호",
     "errors-invalid-number-email": "유효하지 않은 이메일 또는 전화번호",
diff --git a/packages/modal/src/ui/i18n/mandarin.json b/packages/modal/src/ui/i18n/mandarin.json
index e3ead5cdf..5ab8e636f 100644
--- a/packages/modal/src/ui/i18n/mandarin.json
+++ b/packages/modal/src/ui/i18n/mandarin.json
@@ -6,6 +6,7 @@
     "allChains": "所有链",
     "connect-wallet.more-wallets": "查看更多钱包",
     "connectYourWallet": "连接您的钱包",
+    "linkYourWallet": "关联您的钱包",
     "errors-invalid-email": "无效的电子邮件",
     "errors-invalid-number": "电话号码无效",
     "errors-invalid-number-email": "无效的电子邮件或电话号码",
diff --git a/packages/modal/src/ui/i18n/portuguese.json b/packages/modal/src/ui/i18n/portuguese.json
index 96ee1eae6..aa2f0a3c6 100644
--- a/packages/modal/src/ui/i18n/portuguese.json
+++ b/packages/modal/src/ui/i18n/portuguese.json
@@ -6,6 +6,7 @@
     "allChains": "Todas as cadeias",
     "connect-wallet.more-wallets": "Mais carteiras",
     "connectYourWallet": "Conecte seu portefeuille",
+    "linkYourWallet": "Vincule seu portefeuille",
     "errors-invalid-email": "E-mail inválido",
     "errors-invalid-number": "Número de telefone inválido",
     "errors-invalid-number-email": "Email ou número de telefone inválido",
diff --git a/packages/modal/src/ui/i18n/spanish.json b/packages/modal/src/ui/i18n/spanish.json
index fcf1ca2df..162fde9fb 100644
--- a/packages/modal/src/ui/i18n/spanish.json
+++ b/packages/modal/src/ui/i18n/spanish.json
@@ -6,6 +6,7 @@
     "allChains": "Todas las cadenas",
     "connect-wallet.more-wallets": "Más carteras",
     "connectYourWallet": "Conecte su portefeuille",
+    "linkYourWallet": "Vincule su portefeuille",
     "errors-invalid-email": "Correo electrónico no válido",
     "errors-invalid-number": "Número de teléfono no válido",
     "errors-invalid-number-email": "Correo electrónico o número de teléfono no válido",
diff --git a/packages/modal/src/ui/i18n/turkish.json b/packages/modal/src/ui/i18n/turkish.json
index a9f562a0b..ec19ba452 100644
--- a/packages/modal/src/ui/i18n/turkish.json
+++ b/packages/modal/src/ui/i18n/turkish.json
@@ -6,6 +6,7 @@
     "allChains": "Tüm zincirler",
     "connect-wallet.more-wallets": "Daha fazla cüzdan",
     "connectYourWallet": "Cüzdanınızı bağlayın",
+    "linkYourWallet": "Cüzdanınızı ilişkilendirin",
     "errors-invalid-email": "Geçersiz E-posta",
     "errors-invalid-number": "Geçersiz Telefon Numarası",
     "errors-invalid-number-email": "Geçersiz E-posta veya Telefon Numarası",
diff --git a/packages/modal/src/ui/interfaces.ts b/packages/modal/src/ui/interfaces.ts
index a6148045d..45bb0dfc8 100644
--- a/packages/modal/src/ui/interfaces.ts
+++ b/packages/modal/src/ui/interfaces.ts
@@ -156,6 +156,12 @@ export type AccountLinkingIntentType = (typeof ACCOUNT_LINKING_INTENT)[keyof typ
 
 export interface AccountLinkingState {
   active: boolean;
+  /**
+   * True when the modal is showing the wallet picker for `linkAccount()` called
+   * without a `connectorName`. The user's selection in the ConnectWallet UI will
+   * be routed to the linking flow instead of the regular login flow.
+   */
+  pickerActive: boolean;
   /**
    * The name of the wallet to be linked to.
    */
@@ -177,6 +183,7 @@ export interface AccountLinkingState {
 
 export const DEFAULT_ACCOUNT_LINKING_STATE: AccountLinkingState = {
   active: false,
+  pickerActive: false,
   connectorName: null,
   transportConnectorName: null,
   chainId: null,
diff --git a/packages/modal/src/ui/loginModal.tsx b/packages/modal/src/ui/loginModal.tsx
index bb3db62de..c4aadf904 100644
--- a/packages/modal/src/ui/loginModal.tsx
+++ b/packages/modal/src/ui/loginModal.tsx
@@ -355,6 +355,74 @@ export class LoginModal {
     return this.accountLinkingState.active;
   };
 
+  startAccountLinkingPicker = (params: { chainId: string }): void => {
+    this.accountLinkingState = {
+      ...DEFAULT_ACCOUNT_LINKING_STATE,
+      active: true,
+      pickerActive: true,
+      chainId: params.chainId,
+      intent: ACCOUNT_LINKING_INTENT.LINK,
+    };
+    this.setState({
+      accountLinking: this.accountLinkingState,
+      currentPage: PAGES.WALLET_LIST,
+      modalVisibility: true,
+      status: MODAL_STATUS.INITIALIZED,
+    });
+    if (this.callbacks.onModalVisibility) {
+      this.callbacks.onModalVisibility(true);
+    }
+  };
+
+  endAccountLinkingPicker = (): void => {
+    this.accountLinkingState = { ...this.accountLinkingState, pickerActive: false };
+    this.setState({ accountLinking: this.accountLinkingState });
+  };
+
+  startConnectingLoader = (params: { connector: WALLET_CONNECTOR_TYPE | string; connectorName: string }): void => {
+    this.setState({
+      status: MODAL_STATUS.CONNECTING,
+      modalVisibility: true,
+      detailedLoaderConnector: params.connector,
+      detailedLoaderConnectorName: params.connectorName,
+    });
+    if (this.callbacks.onModalVisibility) {
+      this.callbacks.onModalVisibility(true);
+    }
+  };
+
+  markLoaderAuthorizing = (): void => {
+    this.setState({ status: MODAL_STATUS.AUTHORIZING });
+  };
+
+  endConnectingLoader = (params: { success: boolean; errorMessage?: string }): void => {
+    if (params.success) {
+      this.setState({
+        status: MODAL_STATUS.CONNECTED,
+        postLoadingMessage: "modal.post-loading.connected",
+      });
+      // Loader auto-closes after 1s on CONNECTED for non CONNECT_AND_SIGN modes.
+      // For CONNECT_AND_SIGN, the Loader does not auto-close on CONNECTED, so close explicitly.
+      if (this.uiConfig.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN) {
+        const delay = this.uiConfig.hideSuccessScreen ? 0 : 1000;
+        setTimeout(() => this.closeModal(), delay);
+      }
+      return;
+    }
+
+    if (this.uiConfig.displayErrorsOnModal) {
+      this.setState({
+        modalVisibility: true,
+        status: MODAL_STATUS.ERRORED,
+        postLoadingMessage: params.errorMessage || "modal.post-loading.something-wrong",
+      });
+    } else {
+      this.setState({
+        modalVisibility: false,
+      });
+    }
+  };
+
   open = () => {
     this.setState({
       modalVisibility: true,
diff --git a/packages/no-modal/src/base/account-linking/interfaces.ts b/packages/no-modal/src/base/account-linking/interfaces.ts
index f1bec72d0..971f6ef3a 100644
--- a/packages/no-modal/src/base/account-linking/interfaces.ts
+++ b/packages/no-modal/src/base/account-linking/interfaces.ts
@@ -5,9 +5,13 @@ 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
+   * Example: WALLET_CONNECTORS.METAMASK, WALLET_CONNECTORS.WALLET_CONNECT_V2.
+   *
+   * Optional in the modal SDK (`@web3auth/modal`): when omitted, the modal opens
+   * a wallet picker dedicated to account linking and uses the wallet selected by
+   * the user. Required in the no-modal SDK (`@web3auth/no-modal`).
    */
-  connectorName: WALLET_CONNECTOR_TYPE | string;
+  connectorName?: WALLET_CONNECTOR_TYPE | string;
 
   /**
    * Chain ID to use when generating the wallet identity proof.
diff --git a/packages/no-modal/src/base/core/IWeb3Auth.ts b/packages/no-modal/src/base/core/IWeb3Auth.ts
index 025a2e0b5..7bf0f726f 100644
--- a/packages/no-modal/src/base/core/IWeb3Auth.ts
+++ b/packages/no-modal/src/base/core/IWeb3Auth.ts
@@ -264,7 +264,7 @@ export interface IWeb3Auth extends IWeb3AuthCore {
    * @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>;
+  linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult>;
 
   /**
    * Unlink an external wallet from the currently authenticated user account
diff --git a/packages/no-modal/src/connectors/auth-connector/authConnector.ts b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
index 5a85efe8b..3b1388cc4 100644
--- a/packages/no-modal/src/connectors/auth-connector/authConnector.ts
+++ b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
@@ -726,6 +726,11 @@ class AuthConnector extends BaseConnector<AuthLoginParams> implements IAuthConne
     signatureType: "eip191" | "sip99";
     network: CITADEL_NETWORK;
   }> {
+    // Notify listeners that the linking wallet is about to be asked for a signature so the UI
+    // (e.g. modal) can switch from a "connecting" loader to an "authorizing" prompt while the
+    // user reviews the signature request inside their wallet. Emitted on the isolated wallet
+    // connector (not the auth connector) so it doesn't mutate the global SDK status.
+    connector.emit(CONNECTOR_EVENTS.AUTHORIZING, { connector: connector.name as WALLET_CONNECTOR_TYPE });
     const { challenge, signature, chainNamespace } = await connector.generateChallengeAndSign();
     const address = await this.getLinkingWalletAddress(connector, chainNamespace);
 
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
index be10f02f9..e4f89c0b5 100644
--- a/packages/no-modal/src/noModal.ts
+++ b/packages/no-modal/src/noModal.ts
@@ -646,7 +646,10 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     }
   }
 
-  public async linkAccount(params: LinkAccountParams): Promise<LinkAccountResult> {
+  public async linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult> {
+    if (!params?.connectorName) {
+      throw WalletInitializationError.invalidParams("connectorName is required when calling linkAccount on the no-modal SDK");
+    }
     const chainId = this.resolveLinkAccountChainId(params.chainId);
     const isolatedConnector = await this.createLinkingWalletConnector(params.connectorName, chainId);
     return this.linkAccountWithConnector(params.connectorName, chainId, isolatedConnector);
diff --git a/packages/no-modal/src/react/hooks/useLinkAccount.ts b/packages/no-modal/src/react/hooks/useLinkAccount.ts
index 2be386825..0faa71917 100644
--- a/packages/no-modal/src/react/hooks/useLinkAccount.ts
+++ b/packages/no-modal/src/react/hooks/useLinkAccount.ts
@@ -14,7 +14,7 @@ export interface IUseLinkAccount {
   loading: boolean;
   error: Web3AuthError | null;
   linkedAccounts: LinkedAccountInfo[];
-  linkAccount(params: LinkAccountParams): Promise<LinkAccountResult | void>;
+  linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult | void>;
   unlinkAccount(address: string): Promise<UnlinkAccountResult | void>;
 }
 
@@ -26,7 +26,7 @@ export const useLinkAccount = (): IUseLinkAccount => {
   const [linkedAccounts, setLinkedAccounts] = useState<LinkedAccountInfo[]>([]);
 
   const linkAccount = useCallback(
-    async (params: LinkAccountParams): Promise<LinkAccountResult | void> => {
+    async (params?: LinkAccountParams): Promise<LinkAccountResult | void> => {
       if (!web3Auth) throw WalletInitializationError.notReady();
       setLoading(true);
       setError(null);
diff --git a/packages/no-modal/src/vue/composables/useLinkAccount.ts b/packages/no-modal/src/vue/composables/useLinkAccount.ts
index 55080c10d..c1d7b14ec 100644
--- a/packages/no-modal/src/vue/composables/useLinkAccount.ts
+++ b/packages/no-modal/src/vue/composables/useLinkAccount.ts
@@ -15,7 +15,7 @@ export interface IUseLinkAccount {
   loading: Ref<boolean>;
   error: Ref<Web3AuthError | null>;
   linkedAccounts: Ref<LinkedAccountInfo[]>;
-  linkAccount(params: LinkAccountParams): Promise<LinkAccountResult | void>;
+  linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult | void>;
   unlinkAccount(address: string): Promise<UnlinkAccountResult | void>;
 }
 
@@ -25,7 +25,7 @@ export const useLinkAccount = (): IUseLinkAccount => {
   const error = ref<Web3AuthError | null>(null);
   const linkedAccounts = ref<LinkedAccountInfo[]>([]);
 
-  const linkAccount = async (params: LinkAccountParams): Promise<LinkAccountResult | void> => {
+  const linkAccount = async (params?: LinkAccountParams): Promise<LinkAccountResult | void> => {
     if (!web3Auth.value) throw WalletInitializationError.notReady();
     try {
       error.value = null;