diff --git a/frontend/src/styles/dialogs.css b/frontend/src/styles/dialogs.css
index 1a4d029..bae33dd 100644
--- a/frontend/src/styles/dialogs.css
+++ b/frontend/src/styles/dialogs.css
@@ -143,34 +143,17 @@
     0 0 26px color-mix(in srgb, var(--accent) 42%, transparent);
 }
 
-.link-email-dialog-card {
-  display: grid;
-  grid-template-rows: auto minmax(0, 1fr);
-  height: min(100%, 560px);
-  max-height: 100%;
-  overflow: hidden;
-}
-
-.link-email-dialog-card .dialog-head {
-  position: relative;
-  z-index: 2;
-}
-
-.link-email-dialog-card .payment-dialog-body {
-  min-height: 0;
-}
-
-.password-code-fullscreen {
+.email-code-fullscreen {
   position: fixed;
   inset: 0;
   z-index: 220;
   background: var(--bg);
   overflow-y: auto;
   overscroll-behavior: contain;
-  animation: password-code-fullscreen-enter 0.2s ease-out both;
+  animation: email-code-fullscreen-enter 0.2s ease-out both;
 }
 
-@keyframes password-code-fullscreen-enter {
+@keyframes email-code-fullscreen-enter {
   from {
     opacity: 0;
   }
diff --git a/frontend/src/styles/webapp.css b/frontend/src/styles/webapp.css
index 68f497a..337753a 100644
--- a/frontend/src/styles/webapp.css
+++ b/frontend/src/styles/webapp.css
@@ -2732,8 +2732,7 @@ a {
     width: min(100%, 560px);
   }
 
-  .payment-dialog-card,
-  .link-email-dialog-card {
+  .payment-dialog-card {
     width: min(100%, 640px);
   }
 }
diff --git a/frontend/src/webapp/PaymentDialogs.svelte b/frontend/src/webapp/PaymentDialogs.svelte
index 0de688b..d38cb2c 100644
--- a/frontend/src/webapp/PaymentDialogs.svelte
+++ b/frontend/src/webapp/PaymentDialogs.svelte
@@ -5,13 +5,13 @@
     CheckCircle2,
     CircleX,
     LockKeyhole,
-    RefreshCw,
     TriangleAlert,
   } from "$components/ui/icons.js";
   import { Tooltip } from "$components/ui/primitives.js";
 
   import Button from "$components/ui/button.svelte";
   import Dialog from "$components/ui/dialog.svelte";
+  import EmailCodeScreen from "./auth/EmailCodeScreen.svelte";
   import Input from "$components/ui/input.svelte";
   import {
     EmptyCard,
@@ -391,139 +391,77 @@
 </Dialog>
 
 {#if setPasswordOpen && setPasswordPending}
-  <div class="password-code-fullscreen" role="dialog" aria-modal="true">
-    <div class="phone-screen auth-screen">
-      <header class="screen-head center-title">
-        <Button
-          variant="icon"
-          size="icon"
-          onclick={closeSetPasswordDialog}
-          aria-label={t("wa_back")}
-        >
-          <ArrowLeft size={19} />
-        </Button>
-        <div>
-          <h1>{t("wa_email_verification_title")}</h1>
-          <p>{t("wa_email_sent_to", { email: setPasswordEmail || "" })}</p>
-        </div>
-        <span></span>
-      </header>
-      <div class="otp-wrap">
-        <label class="otp-input-wrap">
-          <input
-            bind:value={setPasswordCode}
-            inputmode="numeric"
-            autocomplete="one-time-code"
-            maxlength="6"
-            aria-label={t("wa_email_code_aria")}
-          />
-          <span class="otp-slots" aria-hidden="true">
-            {#each Array.from({ length: 6 }) as _, index}
-              <span class:filled={setPasswordCode[index]}>{setPasswordCode[index] || ""}</span>
-            {/each}
-          </span>
-        </label>
-        <Button class="wide" onclick={confirmSetPassword} disabled={setPasswordBusy}>
-          {t("wa_confirm")}
-        </Button>
-        {#if setPasswordStatus}
-          <StatusMessage error={setPasswordIsError}>{setPasswordStatus}</StatusMessage>
-        {/if}
-        <button
-          class="link-button"
-          type="button"
-          onclick={requestSetPasswordCode}
-          disabled={setPasswordBusy || setPasswordResendCooldown > 0}
-        >
-          <RefreshCw size={15} />
-          {setPasswordResendCooldown > 0
-            ? t("wa_auth_resend_wait", { seconds: setPasswordResendCooldown })
-            : t("wa_resend_code")}
-        </button>
-      </div>
-    </div>
+  <div class="email-code-fullscreen" role="dialog" aria-modal="true">
+    <EmailCodeScreen
+      bind:code={setPasswordCode}
+      email={setPasswordEmail || ""}
+      busy={setPasswordBusy}
+      resendCooldown={setPasswordResendCooldown}
+      status={setPasswordStatus}
+      isError={setPasswordIsError}
+      {t}
+      onBack={closeSetPasswordDialog}
+      onConfirm={confirmSetPassword}
+      onResend={requestSetPasswordCode}
+    />
+  </div>
+{/if}
+
+{#if linkEmailOpen && linkEmailPending}
+  <div class="email-code-fullscreen" role="dialog" aria-modal="true">
+    <EmailCodeScreen
+      bind:code={linkEmailCode}
+      email={linkEmailPending}
+      busy={linkEmailBusy}
+      resendCooldown={linkEmailResendCooldown}
+      status={linkEmailStatus}
+      isError={linkEmailIsError}
+      {t}
+      onBack={closeLinkEmailDialog}
+      onConfirm={verifyLinkEmailCode}
+      onResend={requestLinkEmailCode}
+    />
   </div>
 {/if}
 
 <Dialog
-  open={linkEmailOpen}
+  open={linkEmailOpen && !linkEmailPending}
   title={t("wa_link_email_modal_title")}
-  description={linkEmailPending
-    ? t("wa_email_sent_to", { email: linkEmailPending })
-    : t("wa_link_email_modal_desc")}
+  description={t("wa_link_email_modal_desc")}
   closeLabel={t("wa_close")}
   onclose={closeLinkEmailDialog}
-  class={`payment-dialog-card${linkEmailPending ? " link-email-dialog-card" : ""}`}
+  class="payment-dialog-card"
 >
   <div class="payment-dialog-body">
-    {#if !linkEmailPending}
-      <div class="field-error-wrap">
-        <Tooltip.Root open={Boolean(linkEmailFieldError)}>
-          <Input
-            bind:value={linkEmailValue}
-            type="email"
-            placeholder={t("wa_email_placeholder")}
-            autocomplete="email"
-            class={linkEmailFieldError ? "input-error" : ""}
-            on:input={() => (linkEmailFieldError = "")}
-          />
-          {#if linkEmailFieldError}
-            <Tooltip.Trigger class="field-error-trigger" aria-label={linkEmailFieldError}>
-              <span class="field-error-icon" aria-hidden="true"><TriangleAlert size={18} /></span>
-            </Tooltip.Trigger>
-          {/if}
-          {#if linkEmailFieldError}
-            <Tooltip.Portal>
-              <Tooltip.Content class="field-error-tooltip">{linkEmailFieldError}</Tooltip.Content>
-            </Tooltip.Portal>
-          {/if}
-        </Tooltip.Root>
-      </div>
-      <Button
-        class="wide bottom-action payment-submit-button"
-        onclick={requestLinkEmailCode}
-        disabled={linkEmailBusy}
-      >
-        {t("wa_send_code_email")}
-      </Button>
-    {:else}
-      <div class="link-email-code-layout">
-        <div class="otp-wrap link-email-code-center">
-          <label class="otp-input-wrap">
-            <input
-              bind:value={linkEmailCode}
-              inputmode="numeric"
-              autocomplete="one-time-code"
-              maxlength="6"
-              aria-label={t("wa_email_code_aria")}
-            />
-            <span class="otp-slots" aria-hidden="true">
-              {#each Array.from({ length: 6 }) as _, index}
-                <span class:filled={linkEmailCode[index]}>{linkEmailCode[index] || ""}</span>
-              {/each}
-            </span>
-          </label>
-          <Button
-            class="wide bottom-action payment-submit-button"
-            onclick={verifyLinkEmailCode}
-            disabled={linkEmailBusy}
-          >
-            {t("wa_confirm")}
-          </Button>
-        </div>
-        <button
-          class="link-button link-email-resend"
-          type="button"
-          onclick={requestLinkEmailCode}
-          disabled={linkEmailBusy || linkEmailResendCooldown > 0}
-        >
-          <RefreshCw size={15} />
-          {linkEmailResendCooldown > 0
-            ? t("wa_auth_resend_wait", { seconds: linkEmailResendCooldown })
-            : t("wa_resend_code")}
-        </button>
-      </div>
-    {/if}
+    <div class="field-error-wrap">
+      <Tooltip.Root open={Boolean(linkEmailFieldError)}>
+        <Input
+          bind:value={linkEmailValue}
+          type="email"
+          placeholder={t("wa_email_placeholder")}
+          autocomplete="email"
+          class={linkEmailFieldError ? "input-error" : ""}
+          on:input={() => (linkEmailFieldError = "")}
+        />
+        {#if linkEmailFieldError}
+          <Tooltip.Trigger class="field-error-trigger" aria-label={linkEmailFieldError}>
+            <span class="field-error-icon" aria-hidden="true"><TriangleAlert size={18} /></span>
+          </Tooltip.Trigger>
+        {/if}
+        {#if linkEmailFieldError}
+          <Tooltip.Portal>
+            <Tooltip.Content class="field-error-tooltip">{linkEmailFieldError}</Tooltip.Content>
+          </Tooltip.Portal>
+        {/if}
+      </Tooltip.Root>
+    </div>
+    <Button
+      class="wide bottom-action payment-submit-button"
+      onclick={requestLinkEmailCode}
+      disabled={linkEmailBusy}
+    >
+      {t("wa_send_code_email")}
+    </Button>
     {#if linkEmailStatus}
       <StatusMessage error={linkEmailIsError}>{linkEmailStatus}</StatusMessage>
     {/if}
diff --git a/frontend/src/webapp/auth/AuthScreen.svelte b/frontend/src/webapp/auth/AuthScreen.svelte
index 3674cc3..7df26be 100644
--- a/frontend/src/webapp/auth/AuthScreen.svelte
+++ b/frontend/src/webapp/auth/AuthScreen.svelte
@@ -1,16 +1,10 @@
 <script>
-  import {
-    ArrowLeft,
-    LockKeyhole,
-    Mail,
-    RefreshCw,
-    Send,
-    TriangleAlert,
-  } from "$components/ui/icons.js";
+  import { LockKeyhole, Mail, Send, TriangleAlert } from "$components/ui/icons.js";
   import { Tooltip } from "$components/ui/primitives.js";
 
   import Button from "$components/ui/button.svelte";
   import BrandMark from "$lib/webapp/BrandMark.svelte";
+  import EmailCodeScreen from "./EmailCodeScreen.svelte";
   import Input from "$components/ui/input.svelte";
   import Spinner from "$components/ui/spinner.svelte";
   import { StatusMessage } from "$components/patterns/webapp/index.js";
@@ -55,52 +49,21 @@
   $: authCardHeight = authPanelHeight ? `${authPanelHeight}px` : undefined;
 </script>
 
-<div class="phone-screen auth-screen">
-  {#if screen === "code"}
-    <header class="screen-head center-title">
-      <Button variant="icon" size="icon" onclick={onBackToLogin} aria-label={t("wa_back")}>
-        <ArrowLeft size={19} />
-      </Button>
-      <div>
-        <h1>{t("wa_email_verification_title")}</h1>
-        <p>{t("wa_email_sent_to", { email: pendingEmail })}</p>
-      </div>
-      <span></span>
-    </header>
-    <div class="otp-wrap">
-      <label class="otp-input-wrap">
-        <input
-          bind:value={emailCode}
-          inputmode="numeric"
-          autocomplete="one-time-code"
-          maxlength="6"
-          aria-label={t("wa_email_code_aria")}
-        />
-        <span class="otp-slots" aria-hidden="true">
-          {#each Array.from({ length: 6 }) as _, index}
-            <span class:filled={emailCode[index]}>{emailCode[index] || ""}</span>
-          {/each}
-        </span>
-      </label>
-      <Button class="wide" onclick={verifyEmailCode} disabled={authBusy}>
-        {t("wa_confirm")}
-      </Button>
-      {#if authStatus}
-        <StatusMessage error={authIsError}>{authStatus}</StatusMessage>
-      {/if}
-      <button
-        class="link-button"
-        type="button"
-        onclick={requestEmailCode}
-        disabled={authBusy || authResendCooldown > 0}
-      >
-        <RefreshCw size={15} />
-        {authResendCooldown > 0
-          ? t("wa_auth_resend_wait", { seconds: authResendCooldown })
-          : t("wa_resend_code")}
-      </button>
-    </div>
-  {:else}
+{#if screen === "code"}
+  <EmailCodeScreen
+    bind:code={emailCode}
+    email={pendingEmail}
+    busy={authBusy}
+    resendCooldown={authResendCooldown}
+    status={authStatus}
+    isError={authIsError}
+    {t}
+    onBack={onBackToLogin}
+    onConfirm={verifyEmailCode}
+    onResend={requestEmailCode}
+  />
+{:else}
+  <div class="phone-screen auth-screen">
     <div class="auth-card-wrap">
       <div class="login-brand login-brand-auth">
         <BrandMark {brand} size="xl" />
@@ -305,5 +268,5 @@
         </div>
       {/if}
     </div>
-  {/if}
-</div>
+  </div>
+{/if}
diff --git a/frontend/src/webapp/auth/EmailCodeScreen.svelte b/frontend/src/webapp/auth/EmailCodeScreen.svelte
new file mode 100644
index 0000000..2f04803
--- /dev/null
+++ b/frontend/src/webapp/auth/EmailCodeScreen.svelte
@@ -0,0 +1,63 @@
+<script>
+  import { ArrowLeft, RefreshCw } from "$components/ui/icons.js";
+
+  import Button from "$components/ui/button.svelte";
+  import { StatusMessage } from "$components/patterns/webapp/index.js";
+
+  export let code = "";
+  export let email = "";
+  export let busy = false;
+  export let resendCooldown = 0;
+  export let status = "";
+  export let isError = false;
+  export let t = (key) => key;
+  export let onBack = () => {};
+  export let onConfirm = () => {};
+  export let onResend = () => {};
+</script>
+
+<div class="phone-screen auth-screen">
+  <header class="screen-head center-title">
+    <Button variant="icon" size="icon" onclick={onBack} aria-label={t("wa_back")}>
+      <ArrowLeft size={19} />
+    </Button>
+    <div>
+      <h1>{t("wa_email_verification_title")}</h1>
+      <p>{t("wa_email_sent_to", { email })}</p>
+    </div>
+    <span></span>
+  </header>
+  <div class="otp-wrap">
+    <label class="otp-input-wrap">
+      <input
+        bind:value={code}
+        inputmode="numeric"
+        autocomplete="one-time-code"
+        maxlength="6"
+        aria-label={t("wa_email_code_aria")}
+      />
+      <span class="otp-slots" aria-hidden="true">
+        {#each Array.from({ length: 6 }) as _, index}
+          <span class:filled={code[index]}>{code[index] || ""}</span>
+        {/each}
+      </span>
+    </label>
+    <Button class="wide" onclick={onConfirm} disabled={busy}>
+      {t("wa_confirm")}
+    </Button>
+    {#if status}
+      <StatusMessage error={isError}>{status}</StatusMessage>
+    {/if}
+    <button
+      class="link-button"
+      type="button"
+      onclick={onResend}
+      disabled={busy || resendCooldown > 0}
+    >
+      <RefreshCw size={15} />
+      {resendCooldown > 0
+        ? t("wa_auth_resend_wait", { seconds: resendCooldown })
+        : t("wa_resend_code")}
+    </button>
+  </div>
+</div>