diff --git a/frontend/bun.lock b/frontend/bun.lock
index 5ebd74298..334992231 100644
--- a/frontend/bun.lock
+++ b/frontend/bun.lock
@@ -4,7 +4,7 @@
     "": {
       "name": "maple",
       "dependencies": {
-        "@opensecret/react": "1.3.1",
+        "@opensecret/react": "1.3.3",
         "@radix-ui/react-alert-dialog": "^1.1.1",
         "@radix-ui/react-avatar": "^1.1.0",
         "@radix-ui/react-dialog": "^1.1.1",
@@ -214,7 +214,7 @@
 
     "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="],
 
-    "@opensecret/react": ["@opensecret/react@1.3.1", "", { "dependencies": { "@peculiar/x509": "^1.12.2", "@stablelib/base64": "^2.0.0", "@stablelib/chacha20poly1305": "^2.0.0", "@stablelib/random": "^2.0.0", "cbor2": "^1.7.0", "tweetnacl": "^1.0.3", "zod": "^3.23.8" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-C53cinMhkn2HNJ2LJxY5+xhVcyT2Y6p7z9nsAXCMkBQl677VteMGaDPifxsJpEIX1bBp5ZEsKIRX1md2zta3yw=="],
+    "@opensecret/react": ["@opensecret/react@1.3.3", "", { "dependencies": { "@peculiar/x509": "^1.12.2", "@stablelib/base64": "^2.0.0", "@stablelib/chacha20poly1305": "^2.0.0", "@stablelib/random": "^2.0.0", "cbor2": "^1.7.0", "tweetnacl": "^1.0.3", "zod": "^3.23.8" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-2bLX1RCAPezyXeN0pZjc1Q0jp0x1rTcrkUR12clXzQAIKtRtv3kBEmEg3YCG7Xgx5TlzSI+eYn2GLBU/h+lEww=="],
 
     "@peculiar/asn1-cms": ["@peculiar/asn1-cms@2.3.15", "", { "dependencies": { "@peculiar/asn1-schema": "^2.3.15", "@peculiar/asn1-x509": "^2.3.15", "@peculiar/asn1-x509-attr": "^2.3.15", "asn1js": "^3.0.5", "tslib": "^2.8.1" } }, "sha512-B+DoudF+TCrxoJSTjjcY8Mmu+lbv8e7pXGWrhNp2/EGJp9EEcpzjBCar7puU57sGifyzaRVM03oD5L7t7PghQg=="],
 
diff --git a/frontend/package.json b/frontend/package.json
index 04b43d736..d3523f6a6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
     "mdast-util-gfm-autolink-literal": "2.0.0"
   },
   "dependencies": {
-    "@opensecret/react": "1.3.1",
+    "@opensecret/react": "1.3.3",
     "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-avatar": "^1.1.0",
     "@radix-ui/react-dialog": "^1.1.1",
diff --git a/frontend/src/components/AccountDialog.tsx b/frontend/src/components/AccountDialog.tsx
index 9fe7cce33..117dba6e6 100644
--- a/frontend/src/components/AccountDialog.tsx
+++ b/frontend/src/components/AccountDialog.tsx
@@ -20,13 +20,15 @@ import {
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { useOpenSecret } from "@opensecret/react";
-import { CheckCircle, XCircle } from "lucide-react";
+import { CheckCircle, XCircle, Trash } from "lucide-react";
 import { ChangePasswordDialog } from "./ChangePasswordDialog";
 import { useLocalState } from "@/state/useLocalState";
+import { DeleteAccountDialog } from "./DeleteAccountDialog";
 
 export function AccountDialog() {
   const os = useOpenSecret();
   const [isChangePasswordOpen, setIsChangePasswordOpen] = useState(false);
+  const [isDeleteAccountOpen, setIsDeleteAccountOpen] = useState(false);
   const [verificationStatus, setVerificationStatus] = useState<"unverified" | "pending">(
     "unverified"
   );
@@ -105,11 +107,33 @@ export function AccountDialog() {
               </SelectContent>
             </Select>
           </div>
-          {isEmailUser && (
-            <DialogTrigger asChild>
-              <Button onClick={() => setIsChangePasswordOpen(true)}>Change Password</Button>
-            </DialogTrigger>
-          )}
+          <div className="flex flex-col space-y-2">
+            {isEmailUser && (
+              <DialogTrigger asChild>
+                <Button
+                  onClick={(e) => {
+                    e.preventDefault(); // Prevent form submission
+                    setIsChangePasswordOpen(true);
+                  }}
+                  type="button" // Explicitly set type to button
+                >
+                  Change Password
+                </Button>
+              </DialogTrigger>
+            )}
+            <Button
+              variant="outline"
+              className="border-destructive text-destructive hover:bg-destructive/10"
+              onClick={(e) => {
+                e.preventDefault(); // Prevent form submission
+                setIsDeleteAccountOpen(true);
+              }}
+              type="button" // Explicitly set type to button to prevent form submission
+            >
+              <Trash className="mr-2 h-4 w-4" />
+              Delete Account
+            </Button>
+          </div>
         </form>
         <DialogFooter>
           <Button type="submit" disabled>
@@ -120,6 +144,7 @@ export function AccountDialog() {
       {isEmailUser && (
         <ChangePasswordDialog open={isChangePasswordOpen} onOpenChange={setIsChangePasswordOpen} />
       )}
+      <DeleteAccountDialog open={isDeleteAccountOpen} onOpenChange={setIsDeleteAccountOpen} />
     </>
   );
 }
diff --git a/frontend/src/components/DeleteAccountDialog.tsx b/frontend/src/components/DeleteAccountDialog.tsx
new file mode 100644
index 000000000..63e966f2e
--- /dev/null
+++ b/frontend/src/components/DeleteAccountDialog.tsx
@@ -0,0 +1,189 @@
+import { useState } from "react";
+import { AlertDestructive } from "@/components/AlertDestructive";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import {
+  AlertDialog,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle
+} from "@/components/ui/alert-dialog";
+import { generateSecureSecret, hashSecret, useOpenSecret } from "@opensecret/react";
+import { getBillingService } from "@/billing/billingService";
+import { Loader2 } from "lucide-react";
+
+interface DeleteAccountDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function DeleteAccountDialog({ open, onOpenChange }: DeleteAccountDialogProps) {
+  const os = useOpenSecret();
+  const [step, setStep] = useState<"request" | "confirm">("request");
+  const [uuid, setUuid] = useState("");
+  const [secret, setSecret] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [confirmText, setConfirmText] = useState("");
+
+  // Initial request for account deletion
+  const handleRequestDeletion = async () => {
+    if (confirmText !== "DELETE") {
+      setError("Please type DELETE to confirm");
+      return;
+    }
+
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      // Generate a random secret and store it
+      const generatedSecret = generateSecureSecret();
+      const hashedSecret = await hashSecret(generatedSecret);
+
+      // Request account deletion
+      await os.requestAccountDeletion(hashedSecret);
+
+      // Store the secret and move to confirmation step
+      setSecret(generatedSecret);
+      setStep("confirm");
+    } catch (err) {
+      setError("Failed to request account deletion. Please try again.");
+      console.error(err);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  // Confirm deletion with the UUID from email
+  const handleConfirmDeletion = async () => {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      // Confirm account deletion with UUID and secret
+      await os.confirmAccountDeletion(uuid, secret);
+
+      // Clear all tokens and storage
+      try {
+        // Clear billing token
+        getBillingService().clearToken();
+      } catch (error) {
+        console.error("Error clearing billing token:", error);
+        // Fallback to direct session storage removal
+        sessionStorage.removeItem("maple_billing_token");
+      }
+
+      // Sign out
+      await os.signOut();
+
+      // Force page refresh to go to logged out state
+      window.location.href = "/";
+    } catch (err) {
+      setError("Failed to confirm account deletion. Please verify your code and try again.");
+      console.error(err);
+      setIsLoading(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setStep("request");
+    setError(null);
+    setConfirmText("");
+    setUuid("");
+    onOpenChange(false);
+  };
+
+  return (
+    <AlertDialog open={open} onOpenChange={onOpenChange}>
+      <AlertDialogContent className="max-w-md">
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            {step === "request" ? "Delete Account" : "Confirm Account Deletion"}
+          </AlertDialogTitle>
+          <AlertDialogDescription>
+            {step === "request"
+              ? "This action cannot be undone. This will permanently delete your account and all your data."
+              : "Please check your email for a confirmation code and enter it below."}
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+
+        <div className="mt-4 space-y-4">
+          {step === "request" && (
+            <div className="space-y-4">
+              <div className="rounded-md bg-destructive/10 p-3 text-sm text-destructive">
+                <p>
+                  Warning: This will permanently delete your account and all associated data. You
+                  will lose access to any paid features, chat history, and settings.
+                </p>
+              </div>
+              <div className="space-y-2">
+                <Label htmlFor="confirm-text">Type DELETE to confirm</Label>
+                <Input
+                  id="confirm-text"
+                  value={confirmText}
+                  onChange={(e) => setConfirmText(e.target.value)}
+                  className="w-full"
+                />
+              </div>
+            </div>
+          )}
+
+          {step === "confirm" && (
+            <div className="space-y-2">
+              <Label htmlFor="confirmation-code">Confirmation Code</Label>
+              <Input
+                id="confirmation-code"
+                value={uuid}
+                onChange={(e) => setUuid(e.target.value)}
+                placeholder="Enter code from email"
+                className="w-full"
+              />
+            </div>
+          )}
+
+          {error && <AlertDestructive title="Error" description={error} />}
+        </div>
+
+        <AlertDialogFooter className="mt-4">
+          <AlertDialogCancel onClick={handleCancel}>Cancel</AlertDialogCancel>
+          {step === "request" ? (
+            <Button
+              variant="destructive"
+              onClick={handleRequestDeletion}
+              disabled={isLoading || confirmText !== "DELETE"}
+            >
+              {isLoading ? (
+                <>
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                  Processing...
+                </>
+              ) : (
+                "Delete Account"
+              )}
+            </Button>
+          ) : (
+            <Button
+              variant="destructive"
+              onClick={handleConfirmDeletion}
+              disabled={isLoading || !uuid}
+            >
+              {isLoading ? (
+                <>
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                  Processing...
+                </>
+              ) : (
+                "Confirm Deletion"
+              )}
+            </Button>
+          )}
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}