diff --git a/apps/web/app/(app)/accounts/AddAccount.tsx b/apps/web/app/(app)/accounts/AddAccount.tsx
index ed0748cfa6..6e97dc1c84 100644
--- a/apps/web/app/(app)/accounts/AddAccount.tsx
+++ b/apps/web/app/(app)/accounts/AddAccount.tsx
@@ -19,13 +19,10 @@ export function AddAccount() {
     setLoading(true);
 
     try {
-      const response = await fetch(
-        `/api/${provider}/linking/auth-url?action=auto`,
-        {
-          method: "GET",
-          headers: { "Content-Type": "application/json" },
-        },
-      );
+      const response = await fetch(`/api/${provider}/linking/auth-url`, {
+        method: "GET",
+        headers: { "Content-Type": "application/json" },
+      });
 
       if (!response.ok) {
         toastError({
@@ -86,8 +83,8 @@ export function AddAccount() {
           <span className="ml-2">Add Microsoft Account</span>
         </Button>
 
-        <TypographyP className="text-sm">
-          You will be billed for each additional account
+        <TypographyP className="text-sm text-muted-foreground">
+          You will be billed for each account.
         </TypographyP>
       </CardContent>
     </Card>
diff --git a/apps/web/app/(app)/accounts/page.tsx b/apps/web/app/(app)/accounts/page.tsx
index b8bbc2a44c..8f08be7b5b 100644
--- a/apps/web/app/(app)/accounts/page.tsx
+++ b/apps/web/app/(app)/accounts/page.tsx
@@ -3,7 +3,7 @@
 import { useAction } from "next-safe-action/hooks";
 import Link from "next/link";
 import { Trash2, ArrowRight, BotIcon } from "lucide-react";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 import { useSearchParams, useRouter, usePathname } from "next/navigation";
 import { ConfirmDialog } from "@/components/ConfirmDialog";
 import { LoadingContent } from "@/components/LoadingContent";
@@ -25,16 +25,6 @@ import { PageHeader } from "@/components/PageHeader";
 import { PageWrapper } from "@/components/PageWrapper";
 import { logOut } from "@/utils/user";
 import { getAndClearAuthErrorCookie } from "@/utils/auth-cookies";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "@/components/ui/alert-dialog";
 
 export default function AccountsPage() {
   const { data, isLoading, error, mutate } = useAccounts();
@@ -45,7 +35,7 @@ export default function AccountsPage() {
       <PageHeader title="Accounts" description="Manage your email accounts." />
 
       <LoadingContent loading={isLoading} error={error}>
-        <div className="grid grid-cols-1 gap-4 py-6 md:grid-cols-2 lg:grid-cols-3">
+        <div className="grid grid-cols-1 gap-4 py-6 lg:grid-cols-2 xl:grid-cols-3">
           {data?.emailAccounts.map((emailAccount) => (
             <AccountItem
               key={emailAccount.id}
@@ -56,8 +46,6 @@ export default function AccountsPage() {
           <AddAccount />
         </div>
       </LoadingContent>
-
-      <MergeConfirmationDialog />
     </PageWrapper>
   );
 }
@@ -145,97 +133,6 @@ function AccountItem({
   );
 }
 
-function MergeConfirmationDialog() {
-  const searchParams = useSearchParams();
-  const router = useRouter();
-  const pathname = usePathname();
-  const [showDialog, setShowDialog] = useState(false);
-  const [provider, setProvider] = useState<"google" | "microsoft">();
-  const [email, setEmail] = useState<string>();
-  const [isConfirming, setIsConfirming] = useState(false);
-
-  useEffect(() => {
-    const confirmMerge = searchParams.get("confirm_merge");
-    const providerParam = searchParams.get("provider");
-    const emailParam = searchParams.get("email");
-
-    if (confirmMerge === "true" && providerParam && emailParam) {
-      setShowDialog(true);
-      setProvider(providerParam as "google" | "microsoft");
-      setEmail(emailParam);
-      router.replace(pathname);
-    }
-  }, [searchParams, router, pathname]);
-
-  const handleConfirm = async () => {
-    if (!provider) return;
-
-    setIsConfirming(true);
-    try {
-      const apiProvider = provider === "google" ? "google" : "outlook";
-      const response = await fetch(
-        `/api/${apiProvider}/linking/auth-url?action=merge_confirmed`,
-        {
-          method: "GET",
-          headers: { "Content-Type": "application/json" },
-        },
-      );
-
-      if (!response.ok) {
-        toastError({
-          title: "Error initiating merge",
-          description: "Please try again or contact support",
-        });
-        setIsConfirming(false);
-        return;
-      }
-
-      const data = await response.json();
-      window.location.href = data.url;
-    } catch (error) {
-      console.error("Error initiating merge:", error);
-      toastError({
-        title: "Error initiating merge",
-        description: "Please try again or contact support",
-      });
-      setIsConfirming(false);
-    }
-  };
-
-  const handleCancel = () => {
-    setShowDialog(false);
-    setProvider(undefined);
-    setEmail(undefined);
-  };
-
-  return (
-    <AlertDialog open={showDialog} onOpenChange={setShowDialog}>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle>Merge Accounts?</AlertDialogTitle>
-          <AlertDialogDescription>
-            The {provider === "google" ? "Google" : "Microsoft"} account{" "}
-            <strong>{email}</strong> already has an Inbox Zero account.
-            <br />
-            <br />
-            Merging will combine both accounts into one. This will delete the
-            old account and move all its data to your current account. This
-            action cannot be undone.
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel onClick={handleCancel} disabled={isConfirming}>
-            Cancel
-          </AlertDialogCancel>
-          <AlertDialogAction onClick={handleConfirm} disabled={isConfirming}>
-            {isConfirming ? "Merging..." : "Merge Accounts"}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}
-
 function useAccountNotifications() {
   const searchParams = useSearchParams();
   const router = useRouter();
diff --git a/apps/web/app/(landing)/components/page.tsx b/apps/web/app/(landing)/components/page.tsx
index a806fb78e9..f72f35ba1c 100644
--- a/apps/web/app/(landing)/components/page.tsx
+++ b/apps/web/app/(landing)/components/page.tsx
@@ -38,7 +38,7 @@ import { SettingCard } from "@/components/SettingCard";
 import { IconCircle } from "@/app/(app)/[emailAccountId]/onboarding/IconCircle";
 import { ActionBadges } from "@/app/(app)/[emailAccountId]/assistant/Rules";
 import { DismissibleVideoCard } from "@/components/VideoCard";
-import { PremiumExpiredCardContent } from "@/components/PremiumExpiredCard";
+import { PremiumExpiredCardContent } from "@/components/PremiumCard";
 import {
   ResultsDisplay,
   ResultDisplayContent,
diff --git a/apps/web/app/api/google/linking/auth-url/route.ts b/apps/web/app/api/google/linking/auth-url/route.ts
index 612faa2393..c39705123c 100644
--- a/apps/web/app/api/google/linking/auth-url/route.ts
+++ b/apps/web/app/api/google/linking/auth-url/route.ts
@@ -1,5 +1,4 @@
 import { NextResponse } from "next/server";
-import { z } from "zod";
 import { withAuth } from "@/utils/middleware";
 import { getLinkingOAuth2Client } from "@/utils/gmail/client";
 import { GOOGLE_LINKING_STATE_COOKIE_NAME } from "@/utils/gmail/constants";
@@ -11,18 +10,10 @@ import {
 
 export type GetAuthLinkUrlResponse = { url: string };
 
-const actionSchema = z.enum(["auto", "merge_confirmed"]);
-
-const getAuthUrl = ({
-  userId,
-  action,
-}: {
-  userId: string;
-  action: "auto" | "merge_confirmed";
-}) => {
+const getAuthUrl = ({ userId }: { userId: string }) => {
   const googleAuth = getLinkingOAuth2Client();
 
-  const state = generateOAuthState({ userId, action });
+  const state = generateOAuthState({ userId });
 
   const url = googleAuth.generateAuthUrl({
     access_type: "offline",
@@ -36,23 +27,7 @@ const getAuthUrl = ({
 
 export const GET = withAuth("google/linking/auth-url", async (request) => {
   const userId = request.auth.userId;
-  const url = new URL(request.url);
-
-  const actionParam = url.searchParams.get("action");
-  const parseResult = actionSchema.safeParse(actionParam);
-
-  if (!parseResult.success) {
-    return NextResponse.json(
-      {
-        error:
-          "Invalid or missing action parameter. Must be 'auto' or 'merge_confirmed'.",
-      },
-      { status: 400 },
-    );
-  }
-
-  const action = parseResult.data;
-  const { url: authUrl, state } = getAuthUrl({ userId, action });
+  const { url: authUrl, state } = getAuthUrl({ userId });
 
   const response = NextResponse.json({ url: authUrl });
 
diff --git a/apps/web/app/api/google/linking/callback/route.ts b/apps/web/app/api/google/linking/callback/route.ts
index 3aa3470146..fba1e8fe44 100644
--- a/apps/web/app/api/google/linking/callback/route.ts
+++ b/apps/web/app/api/google/linking/callback/route.ts
@@ -30,7 +30,7 @@ export const GET = withError("google/linking/callback", async (request) => {
     return validation.response;
   }
 
-  const { targetUserId, action, code } = validation;
+  const { targetUserId, code } = validation;
   const redirectUrl = new URL("/accounts", request.nextUrl.origin);
   const response = NextResponse.redirect(redirectUrl);
   response.cookies.delete(GOOGLE_LINKING_STATE_COOKIE_NAME);
@@ -95,7 +95,6 @@ export const GET = withError("google/linking/callback", async (request) => {
       hasEmailAccount: !!existingAccount?.emailAccount,
       existingUserId: existingAccount?.userId || null,
       targetUserId,
-      action,
       provider: "google",
       providerEmail,
       baseUrl: request.nextUrl.origin,
diff --git a/apps/web/app/api/outlook/linking/auth-url/route.ts b/apps/web/app/api/outlook/linking/auth-url/route.ts
index c179e4fdb3..86e3f8ffdc 100644
--- a/apps/web/app/api/outlook/linking/auth-url/route.ts
+++ b/apps/web/app/api/outlook/linking/auth-url/route.ts
@@ -1,5 +1,4 @@
 import { NextResponse } from "next/server";
-import { z } from "zod";
 import { withAuth } from "@/utils/middleware";
 import { getLinkingOAuth2Url } from "@/utils/outlook/client";
 import { OUTLOOK_LINKING_STATE_COOKIE_NAME } from "@/utils/outlook/constants";
@@ -10,16 +9,8 @@ import {
 
 export type GetOutlookAuthLinkUrlResponse = { url: string };
 
-const actionSchema = z.enum(["auto", "merge_confirmed"]);
-
-const getAuthUrl = ({
-  userId,
-  action,
-}: {
-  userId: string;
-  action: "auto" | "merge_confirmed";
-}) => {
-  const state = generateOAuthState({ userId, action });
+const getAuthUrl = ({ userId }: { userId: string }) => {
+  const state = generateOAuthState({ userId });
 
   const baseUrl = getLinkingOAuth2Url();
   const url = `${baseUrl}&state=${state}`;
@@ -29,23 +20,7 @@ const getAuthUrl = ({
 
 export const GET = withAuth("outlook/linking/auth-url", async (request) => {
   const userId = request.auth.userId;
-  const url = new URL(request.url);
-
-  const actionParam = url.searchParams.get("action");
-  const parseResult = actionSchema.safeParse(actionParam);
-
-  if (!parseResult.success) {
-    return NextResponse.json(
-      {
-        error:
-          "Invalid or missing action parameter. Must be 'auto' or 'merge_confirmed'.",
-      },
-      { status: 400 },
-    );
-  }
-
-  const action = parseResult.data;
-  const { url: authUrl, state } = getAuthUrl({ userId, action });
+  const { url: authUrl, state } = getAuthUrl({ userId });
 
   const response = NextResponse.json({ url: authUrl });
 
diff --git a/apps/web/app/api/outlook/linking/callback/route.ts b/apps/web/app/api/outlook/linking/callback/route.ts
index b1c4f94526..45c3172a33 100644
--- a/apps/web/app/api/outlook/linking/callback/route.ts
+++ b/apps/web/app/api/outlook/linking/callback/route.ts
@@ -33,7 +33,7 @@ export const GET = withError("outlook/linking/callback", async (request) => {
     return validation.response;
   }
 
-  const { targetUserId, action, code } = validation;
+  const { targetUserId, code } = validation;
   const redirectUrl = new URL("/accounts", request.nextUrl.origin);
   const response = NextResponse.redirect(redirectUrl);
   response.cookies.delete(OUTLOOK_LINKING_STATE_COOKIE_NAME);
@@ -129,7 +129,6 @@ export const GET = withError("outlook/linking/callback", async (request) => {
       hasEmailAccount: !!existingAccount?.emailAccount,
       existingUserId: existingAccount?.userId || null,
       targetUserId,
-      action,
       provider: "microsoft",
       providerEmail,
       baseUrl: request.nextUrl.origin,
diff --git a/apps/web/components/PremiumExpiredCard.tsx b/apps/web/components/PremiumCard.tsx
similarity index 82%
rename from apps/web/components/PremiumExpiredCard.tsx
rename to apps/web/components/PremiumCard.tsx
index 4ba71b0163..f3a9eadd32 100644
--- a/apps/web/components/PremiumExpiredCard.tsx
+++ b/apps/web/components/PremiumCard.tsx
@@ -28,11 +28,8 @@ export function PremiumExpiredCardContent({
   onDismiss,
   isCollapsed = false,
 }: PremiumExpiredCardProps & { isCollapsed?: boolean }) {
-  // Early return if no premium data
-  if (!premium) return null;
-
   // Convert string dates to Date objects if needed
-  const lemonSqueezyRenewsAt = premium.lemonSqueezyRenewsAt
+  const lemonSqueezyRenewsAt = premium?.lemonSqueezyRenewsAt
     ? typeof premium.lemonSqueezyRenewsAt === "string"
       ? new Date(premium.lemonSqueezyRenewsAt)
       : premium.lemonSqueezyRenewsAt
@@ -40,17 +37,38 @@ export function PremiumExpiredCardContent({
 
   const isUserPremium = isPremium(
     lemonSqueezyRenewsAt,
-    premium.stripeSubscriptionStatus || null,
+    premium?.stripeSubscriptionStatus || null,
   );
 
   if (isUserPremium) return null;
 
-  // Determine the message based on subscription state
   const getSubscriptionMessage = () => {
+    const UPGRADE_MESSAGE = {
+      title: "Upgrade to Premium",
+      description: "Upgrade to Premium to enable your AI email assistant.",
+    };
+
+    if (!premium) {
+      return UPGRADE_MESSAGE;
+    }
+
     const status = premium.stripeSubscriptionStatus;
     const hasLemonSqueezyExpired =
       lemonSqueezyRenewsAt && lemonSqueezyRenewsAt < new Date();
 
+    // Check if user never had a subscription
+    const hasNoSubscription =
+      !status &&
+      !premium.stripeSubscriptionId &&
+      !premium.lemonSqueezySubscriptionId;
+
+    if (!premium || hasNoSubscription) {
+      return {
+        title: "Upgrade to Premium",
+        description: "Upgrade to Premium to enable your AI email assistant.",
+      };
+    }
+
     if (status === "past_due") {
       return {
         title: "Payment Past Due",
@@ -95,6 +113,15 @@ export function PremiumExpiredCardContent({
 
   const { title, description } = getSubscriptionMessage();
 
+  const isNewUser =
+    !premium ||
+    (!premium.stripeSubscriptionStatus &&
+      !premium.stripeSubscriptionId &&
+      !premium.lemonSqueezySubscriptionId);
+
+  const buttonText = isNewUser ? "Upgrade" : "Reactivate";
+  const buttonHref = isNewUser ? "/premium" : "/settings";
+
   // When collapsed, show only the alert icon with a hover card
   if (isCollapsed) {
     return (
@@ -112,18 +139,18 @@ export function PremiumExpiredCardContent({
               className="w-full bg-orange-600 text-white hover:bg-orange-700 border-0 shadow-sm h-8 mt-2"
             >
               <Link
-                href="/settings"
+                href={buttonHref}
                 className="flex items-center justify-center gap-1.5"
               >
                 <CreditCardIcon className="h-3.5 w-3.5" />
-                <span className="text-xs font-medium">Reactivate</span>
+                <span className="text-xs font-medium">{buttonText}</span>
               </Link>
             </Button>
           </div>
         }
       >
         <Link
-          href="/settings"
+          href={buttonHref}
           className="flex items-center justify-center p-2 rounded-lg bg-orange-100 hover:bg-orange-200 transition-colors dark:bg-orange-900/30 dark:hover:bg-orange-900/50"
         >
           <AlertTriangleIcon className="h-5 w-5 text-orange-600 dark:text-orange-400" />
@@ -170,11 +197,11 @@ export function PremiumExpiredCardContent({
             className="w-full bg-orange-600 text-white hover:bg-orange-700 border-0 shadow-sm h-8"
           >
             <Link
-              href="/settings"
+              href={buttonHref}
               className="flex items-center justify-center gap-1.5"
             >
               <CreditCardIcon className="h-3.5 w-3.5" />
-              <span className="text-xs font-medium">Reactivate</span>
+              <span className="text-xs font-medium">{buttonText}</span>
             </Link>
           </Button>
         </div>
@@ -183,7 +210,7 @@ export function PremiumExpiredCardContent({
   );
 }
 
-export function PremiumExpiredCard({
+export function PremiumCard({
   isCollapsed = false,
 }: {
   isCollapsed?: boolean;
diff --git a/apps/web/components/ReferralDialog.tsx b/apps/web/components/ReferralDialog.tsx
index 60645fcf43..cc92ade1d0 100644
--- a/apps/web/components/ReferralDialog.tsx
+++ b/apps/web/components/ReferralDialog.tsx
@@ -28,7 +28,7 @@ export function ReferralDialog() {
           <span className="font-semibold">Refer friend</span>
         </SidebarMenuButton>
       </DialogTrigger>
-      <DialogContent className="max-w-4xl">
+      <DialogContent className="max-w-4xl max-h-[90vh] overflow-y-auto">
         <Referrals />
       </DialogContent>
     </Dialog>
@@ -96,12 +96,12 @@ export function Referrals() {
   }
 
   return (
-    <div className="space-y-8">
+    <div className="space-y-6 sm:space-y-8">
       <div className="text-center">
-        <h1 className="text-3xl font-bold tracking-tight text-primary dark:text-foreground">
+        <h1 className="font-title text-2xl sm:text-3xl font-bold text-primary dark:text-foreground">
           Refer Friends, Get Rewards
         </h1>
-        <p className="mt-4 text-lg text-muted-foreground">
+        <p className="mt-3 sm:mt-4 text-sm sm:text-base px-2 text-muted-foreground">
           Share Inbox Zero with friends and get a free month for each friend who
           completes their trial
         </p>
@@ -118,21 +118,15 @@ export function Referrals() {
         <CardContent>
           {codeData?.code ? (
             <div className="space-y-4">
-              <div className="flex flex-col items-center justify-between rounded-lg border bg-gray-50 p-4 sm:flex-row">
-                <span className="font-mono text-2xl font-bold text-gray-900">
-                  {link}
-                </span>
-                {/* <Button
-                  onClick={() => copyToClipboard(link, "code")}
-                  variant="outline"
-                  size="sm"
-                >
-                  <Copy className="mr-2 h-4 w-4" />
-                  Copy Link
-                </Button> */}
+              <div className="rounded-lg border bg-gray-50 p-3 sm:p-4">
+                <div className="overflow-x-auto">
+                  <span className="font-mono text-sm sm:text-base lg:text-lg font-bold text-gray-900 break-all">
+                    {link}
+                  </span>
+                </div>
               </div>
 
-              <div className="flex gap-2">
+              <div className="flex flex-col sm:flex-row gap-2">
                 <Button
                   onClick={() => copyToClipboard(link, "link")}
                   variant="outline"
@@ -201,20 +195,20 @@ export function Referrals() {
 
 function ReferralDashboardSkeleton() {
   return (
-    <div className="space-y-8">
+    <div className="space-y-6 sm:space-y-8">
       <div className="text-center">
-        <Skeleton className="mx-auto h-10 w-96" />
-        <Skeleton className="mx-auto mt-4 h-6 w-[600px]" />
+        <Skeleton className="mx-auto h-8 sm:h-10 w-full max-w-sm" />
+        <Skeleton className="mx-auto mt-3 sm:mt-4 h-5 sm:h-6 w-full max-w-md" />
       </div>
 
       <Card>
         <CardHeader>
           <Skeleton className="h-6 w-40" />
-          <Skeleton className="mt-2 h-4 w-60" />
+          <Skeleton className="mt-2 h-4 w-full max-w-xs" />
         </CardHeader>
         <CardContent>
-          <Skeleton className="h-20 w-full" />
-          <div className="mt-4 flex gap-2">
+          <Skeleton className="h-16 sm:h-20 w-full" />
+          <div className="mt-4 flex flex-col sm:flex-row gap-2">
             <Skeleton className="h-10 flex-1" />
             <Skeleton className="h-10 flex-1" />
           </div>
diff --git a/apps/web/components/SideNav.tsx b/apps/web/components/SideNav.tsx
index 8c07e0eefb..5e4a5779d8 100644
--- a/apps/web/components/SideNav.tsx
+++ b/apps/web/components/SideNav.tsx
@@ -14,7 +14,6 @@ import {
   CalendarIcon,
   ChevronDownIcon,
   ChevronRightIcon,
-  CrownIcon,
   FileIcon,
   InboxIcon,
   type LucideIcon,
@@ -58,7 +57,7 @@ import { prefixPath } from "@/utils/path";
 import { ReferralDialog } from "@/components/ReferralDialog";
 import { isGoogleProvider } from "@/utils/email/provider-types";
 import { NavUser } from "@/components/NavUser";
-import { PremiumExpiredCard } from "@/components/PremiumExpiredCard";
+import { PremiumCard } from "@/components/PremiumCard";
 
 type NavItem = {
   name: string;
@@ -233,7 +232,7 @@ export function SideNav({ ...props }: React.ComponentProps<typeof Sidebar>) {
         </SidebarGroupContent>
       </SidebarContent>
 
-      <PremiumExpiredCard isCollapsed={!state.includes("left-sidebar")} />
+      <PremiumCard isCollapsed={!state.includes("left-sidebar")} />
 
       <SidebarFooter className="pb-4">
         <ClientOnly>
diff --git a/apps/web/components/VideoCard.tsx b/apps/web/components/VideoCard.tsx
index c6fb4c1592..3e1e95344e 100644
--- a/apps/web/components/VideoCard.tsx
+++ b/apps/web/components/VideoCard.tsx
@@ -106,7 +106,7 @@ const VideoCard = React.forwardRef<
               </div>
             </div>
 
-            <div className="flex items-center gap-3 flex-shrink-0">
+            <div className="hidden md:flex items-center gap-3 flex-shrink-0">
               <Dialog open={isOpen} onOpenChange={setIsOpen}>
                 <DialogTrigger asChild>
                   <button
diff --git a/apps/web/utils/oauth/account-linking.test.ts b/apps/web/utils/oauth/account-linking.test.ts
index 73c483542f..5c9f925af5 100644
--- a/apps/web/utils/oauth/account-linking.test.ts
+++ b/apps/web/utils/oauth/account-linking.test.ts
@@ -25,7 +25,6 @@ describe("handleAccountLinking", () => {
       hasEmailAccount: false,
       existingUserId: "orphaned-user-id",
       targetUserId: "target-user-id",
-      action: "auto",
       provider: "google",
       providerEmail: "test@gmail.com",
       baseUrl: "http://localhost:3000",
@@ -45,7 +44,6 @@ describe("handleAccountLinking", () => {
       hasEmailAccount: false,
       existingUserId: null,
       targetUserId: "target-user-id",
-      action: "auto",
       provider: "google",
       providerEmail: "new@gmail.com",
       baseUrl: "http://localhost:3000",
@@ -61,7 +59,6 @@ describe("handleAccountLinking", () => {
       hasEmailAccount: true,
       existingUserId: "same-user-id",
       targetUserId: "same-user-id",
-      action: "auto",
       provider: "google",
       providerEmail: "test@gmail.com",
       baseUrl: "http://localhost:3000",
@@ -75,35 +72,12 @@ describe("handleAccountLinking", () => {
     }
   });
 
-  it("should redirect to confirm merge when account exists for different user and action is auto", async () => {
+  it("should return merge when account exists for different user", async () => {
     const result = await handleAccountLinking({
       existingAccountId: "account-id",
       hasEmailAccount: true,
       existingUserId: "different-user-id",
       targetUserId: "target-user-id",
-      action: "auto",
-      provider: "google",
-      providerEmail: "test@gmail.com",
-      baseUrl: "http://localhost:3000",
-      logger,
-    });
-
-    expect(result.type).toBe("redirect");
-    if (result.type === "redirect") {
-      const url = new URL(result.response.headers.get("location") || "");
-      expect(url.searchParams.get("confirm_merge")).toBe("true");
-      expect(url.searchParams.get("provider")).toBe("google");
-      expect(url.searchParams.get("email")).toBe("test@gmail.com");
-    }
-  });
-
-  it("should return merge when account exists for different user and action is merge_confirmed", async () => {
-    const result = await handleAccountLinking({
-      existingAccountId: "account-id",
-      hasEmailAccount: true,
-      existingUserId: "different-user-id",
-      targetUserId: "target-user-id",
-      action: "merge_confirmed",
       provider: "google",
       providerEmail: "test@gmail.com",
       baseUrl: "http://localhost:3000",
@@ -130,7 +104,6 @@ describe("handleAccountLinking", () => {
       hasEmailAccount: false,
       existingUserId: null,
       targetUserId: "target-user-id",
-      action: "auto",
       provider: "google",
       providerEmail: "existing@gmail.com",
       baseUrl: "http://localhost:3000",
diff --git a/apps/web/utils/oauth/account-linking.ts b/apps/web/utils/oauth/account-linking.ts
index 5a7fe4d230..1ae2e63407 100644
--- a/apps/web/utils/oauth/account-linking.ts
+++ b/apps/web/utils/oauth/account-linking.ts
@@ -8,7 +8,6 @@ interface AccountLinkingParams {
   hasEmailAccount: boolean;
   existingUserId: string | null;
   targetUserId: string;
-  action: "auto" | "merge_confirmed";
   provider: "google" | "microsoft";
   providerEmail: string;
   baseUrl: string;
@@ -20,7 +19,6 @@ export async function handleAccountLinking({
   hasEmailAccount,
   existingUserId,
   targetUserId,
-  action,
   provider,
   providerEmail,
   baseUrl,
@@ -45,34 +43,27 @@ export async function handleAccountLinking({
   }
 
   if (!existingAccountId || !hasEmailAccount) {
-    if (action === "auto") {
-      const existingEmailAccount = await prisma.emailAccount.findUnique({
-        where: { email: providerEmail.trim().toLowerCase() },
-        select: { userId: true, email: true },
-      });
+    const existingEmailAccount = await prisma.emailAccount.findUnique({
+      where: { email: providerEmail.trim().toLowerCase() },
+      select: { userId: true, email: true },
+    });
 
-      if (
-        existingEmailAccount &&
-        existingEmailAccount.userId !== targetUserId
-      ) {
-        logger.warn(
-          `Create Failed: ${provider} account with this email already exists for a different user.`,
-          {
-            email: providerEmail,
-            existingUserId: existingEmailAccount.userId,
-            targetUserId,
-          },
-        );
-        redirectUrl.searchParams.set(
-          "error",
-          "account_already_exists_use_merge",
-        );
-        return {
-          type: "redirect",
-          response: NextResponse.redirect(redirectUrl),
-        };
-      }
+    if (existingEmailAccount && existingEmailAccount.userId !== targetUserId) {
+      logger.warn(
+        `Create Failed: ${provider} account with this email already exists for a different user.`,
+        {
+          email: providerEmail,
+          existingUserId: existingEmailAccount.userId,
+          targetUserId,
+        },
+      );
+      redirectUrl.searchParams.set("error", "account_already_exists_use_merge");
+      return {
+        type: "redirect",
+        response: NextResponse.redirect(redirectUrl),
+      };
     }
+
     return { type: "continue_create" };
   }
 
@@ -88,29 +79,16 @@ export async function handleAccountLinking({
     };
   }
 
-  if (action === "auto") {
-    logger.info(
-      "Account exists for different user, requesting merge confirmation",
-      {
-        email: providerEmail,
-        existingUserId,
-        targetUserId,
-      },
-    );
-
-    redirectUrl.searchParams.set("confirm_merge", "true");
-    redirectUrl.searchParams.set("provider", provider);
-    redirectUrl.searchParams.set("email", providerEmail);
-    return {
-      type: "redirect",
-      response: NextResponse.redirect(redirectUrl),
-    };
-  }
-
   if (!existingAccountId || !existingUserId) {
     throw new Error("Unexpected state: existingAccount should exist");
   }
 
+  logger.info("Account exists for different user, merging accounts", {
+    email: providerEmail,
+    existingUserId,
+    targetUserId,
+  });
+
   return {
     type: "merge",
     sourceAccountId: existingAccountId,
diff --git a/apps/web/utils/oauth/callback-validation.test.ts b/apps/web/utils/oauth/callback-validation.test.ts
index 6804bc440c..9a1062d5e9 100644
--- a/apps/web/utils/oauth/callback-validation.test.ts
+++ b/apps/web/utils/oauth/callback-validation.test.ts
@@ -32,7 +32,6 @@ describe("validateOAuthCallback", () => {
   it("should return error when code is missing", () => {
     vi.mocked(parseOAuthState).mockReturnValue({
       userId: "user-id",
-      action: "auto",
       nonce: "nonce",
     });
 
@@ -92,7 +91,6 @@ describe("validateOAuthCallback", () => {
     expect(result.success).toBe(true);
     if (result.success) {
       expect(result.targetUserId).toBe("user-id");
-      expect(result.action).toBe("auto");
       expect(result.code).toBe("valid-code");
     }
   });
diff --git a/apps/web/utils/oauth/callback-validation.ts b/apps/web/utils/oauth/callback-validation.ts
index 4d7b1628af..17c38a963e 100644
--- a/apps/web/utils/oauth/callback-validation.ts
+++ b/apps/web/utils/oauth/callback-validation.ts
@@ -15,7 +15,6 @@ type ValidationResult =
   | {
       success: true;
       targetUserId: string;
-      action: "auto" | "merge_confirmed";
       code: string;
     }
   | {
@@ -51,7 +50,6 @@ export function validateOAuthCallback({
 
   let decodedState: {
     userId: string;
-    action: "auto" | "merge_confirmed";
     nonce: string;
   };
   try {
@@ -83,7 +81,6 @@ export function validateOAuthCallback({
   return {
     success: true,
     targetUserId: decodedState.userId,
-    action: decodedState.action,
     code,
   };
 }
diff --git a/version.txt b/version.txt
index 3588849c84..a1109b5970 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.19.0
+v2.19.2