diff --git a/components/auth/register-form.tsx b/components/auth/register-form.tsx
index 50e8af8..d33cb8d 100644
--- a/components/auth/register-form.tsx
+++ b/components/auth/register-form.tsx
@@ -18,6 +18,7 @@ export function RegisterForm({ whitelistOnly = false }: RegisterFormProps) {
   const router = useRouter();
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
   const [displayName, setDisplayName] = useState("");
   const [error, setError] = useState<string | null>(null);
   const [isPending, startTransition] = useTransition();
@@ -27,7 +28,7 @@ export function RegisterForm({ whitelistOnly = false }: RegisterFormProps) {
     setError(null);
 
     startTransition(async () => {
-      const result = await register({ email, password, displayName: displayName || undefined });
+      const result = await register({ email, password, confirmPassword, displayName: displayName || undefined });
       if (result.success) {
         if (process.env.NEXT_PUBLIC_E2E_SKIP_EMAIL_VERIFICATION === "true") {
           router.push("/account");
@@ -114,6 +115,19 @@ export function RegisterForm({ whitelistOnly = false }: RegisterFormProps) {
           </p>
         </div>
 
+        <div className="space-y-2">
+          <Label htmlFor="confirmPassword">Confirm Password</Label>
+          <Input
+            id="confirmPassword"
+            type="password"
+            placeholder="Repeat your password"
+            value={confirmPassword}
+            onChange={(e) => setConfirmPassword(e.target.value)}
+            required
+            disabled={isPending}
+          />
+        </div>
+
         <Button type="submit" className="w-full" disabled={isPending}>
           {isPending ? (
             <>
diff --git a/e2e/auth/register.spec.ts b/e2e/auth/register.spec.ts
index b921a2d..c6ddd0b 100644
--- a/e2e/auth/register.spec.ts
+++ b/e2e/auth/register.spec.ts
@@ -7,7 +7,8 @@ test.describe("User Registration", () => {
     await expect(page.getByRole("heading", { name: "Create an account" })).toBeVisible();
     await expect(page.getByLabel("Display Name")).toBeVisible();
     await expect(page.getByLabel("Email")).toBeVisible();
-    await expect(page.getByLabel("Password")).toBeVisible();
+    await expect(page.getByLabel("Password", { exact: true })).toBeVisible();
+    await expect(page.getByLabel("Confirm Password")).toBeVisible();
     await expect(page.getByRole("button", { name: "Create account" })).toBeVisible();
   });
 
@@ -18,7 +19,8 @@ test.describe("User Registration", () => {
 
     await page.getByLabel("Display Name").fill("Test User");
     await page.getByLabel("Email").fill(uniqueEmail);
-    await page.getByLabel("Password").fill("TestPassword123!");
+    await page.getByLabel("Password", { exact: true }).fill("TestPassword123!");
+    await page.getByLabel("Confirm Password").fill("TestPassword123!");
 
     await page.getByRole("button", { name: "Create account" }).click();
 
@@ -34,7 +36,8 @@ test.describe("User Registration", () => {
     await page.goto("/register");
     await page.getByLabel("Display Name").fill("Test User");
     await page.getByLabel("Email").fill(uniqueEmail);
-    await page.getByLabel("Password").fill("TestPassword123!");
+    await page.getByLabel("Password", { exact: true }).fill("TestPassword123!");
+    await page.getByLabel("Confirm Password").fill("TestPassword123!");
     await page.getByRole("button", { name: "Create account" }).click();
     await expect(page).toHaveURL("/account");
 
@@ -50,7 +53,8 @@ test.describe("User Registration", () => {
     // Try to register with same email
     await page.getByLabel("Display Name").fill("Test User 2");
     await page.getByLabel("Email").fill(uniqueEmail);
-    await page.getByLabel("Password").fill("TestPassword123!");
+    await page.getByLabel("Password", { exact: true }).fill("TestPassword123!");
+    await page.getByLabel("Confirm Password").fill("TestPassword123!");
     await page.getByRole("button", { name: "Create account" }).click();
 
     // Should show error
@@ -62,7 +66,8 @@ test.describe("User Registration", () => {
 
     await page.getByLabel("Display Name").fill("Test User");
     await page.getByLabel("Email").fill("test@example.com");
-    await page.getByLabel("Password").fill("short"); // Less than 8 characters
+    await page.getByLabel("Password", { exact: true }).fill("short"); // Less than 8 characters
+    await page.getByLabel("Confirm Password").fill("short");
 
     await page.getByRole("button", { name: "Create account" }).click();
 
@@ -70,6 +75,20 @@ test.describe("User Registration", () => {
     await expect(page.getByText(/at least 8 characters/i)).toBeVisible();
   });
 
+  test("should show error when passwords do not match", async ({ page }) => {
+    await page.goto("/register");
+
+    await page.getByLabel("Display Name").fill("Test User");
+    await page.getByLabel("Email").fill("test-mismatch@example.com");
+    await page.getByLabel("Password", { exact: true }).fill("TestPassword123!");
+    await page.getByLabel("Confirm Password").fill("DifferentPassword123!");
+
+    await page.getByRole("button", { name: "Create account" }).click();
+
+    // Should show password mismatch error
+    await expect(page.getByText(/passwords do not match/i)).toBeVisible();
+  });
+
   test("should have link to login page", async ({ page }) => {
     await page.goto("/register");
 
diff --git a/lib/validations/auth.test.ts b/lib/validations/auth.test.ts
new file mode 100644
index 0000000..69d19e6
--- /dev/null
+++ b/lib/validations/auth.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, test } from "bun:test";
+import { registerSchema } from "./auth";
+
+describe("registerSchema", () => {
+  test("should accept valid registration with matching passwords", () => {
+    const result = registerSchema.safeParse({
+      email: "test@example.com",
+      password: "password123",
+      confirmPassword: "password123",
+      displayName: "Test User",
+    });
+
+    expect(result.success).toBe(true);
+  });
+
+  test("should accept valid registration without display name", () => {
+    const result = registerSchema.safeParse({
+      email: "test@example.com",
+      password: "password123",
+      confirmPassword: "password123",
+    });
+
+    expect(result.success).toBe(true);
+  });
+
+  test("should reject when passwords do not match", () => {
+    const result = registerSchema.safeParse({
+      email: "test@example.com",
+      password: "password123",
+      confirmPassword: "different456",
+      displayName: "Test User",
+    });
+
+    expect(result.success).toBe(false);
+    if (!result.success) {
+      const confirmPasswordError = result.error.issues.find(
+        (issue) => issue.path.includes("confirmPassword")
+      );
+      expect(confirmPasswordError).toBeDefined();
+      expect(confirmPasswordError!.message).toBe("Passwords do not match");
+    }
+  });
+
+  test("should reject when confirmPassword is missing", () => {
+    const result = registerSchema.safeParse({
+      email: "test@example.com",
+      password: "password123",
+      displayName: "Test User",
+    });
+
+    expect(result.success).toBe(false);
+  });
+
+  test("should reject when password is too short", () => {
+    const result = registerSchema.safeParse({
+      email: "test@example.com",
+      password: "short",
+      confirmPassword: "short",
+    });
+
+    expect(result.success).toBe(false);
+  });
+});
diff --git a/lib/validations/auth.ts b/lib/validations/auth.ts
index 94e70c1..a977114 100644
--- a/lib/validations/auth.ts
+++ b/lib/validations/auth.ts
@@ -27,7 +27,11 @@ export const displayNameSchema = z
 export const registerSchema = z.object({
   email: emailSchema,
   password: passwordSchema,
+  confirmPassword: z.string(),
   displayName: displayNameSchema.optional(),
+}).refine((data) => data.password === data.confirmPassword, {
+  message: "Passwords do not match",
+  path: ["confirmPassword"],
 });
 
 export const loginSchema = z.object({