diff --git a/apps/e2e/tests/account/account.po.ts b/apps/e2e/tests/account/account.po.ts
index faa8589a5..437b5f475 100644
--- a/apps/e2e/tests/account/account.po.ts
+++ b/apps/e2e/tests/account/account.po.ts
@@ -14,15 +14,27 @@ export class AccountPageObject {
     return this.auth.signUpFlow('/home/settings');
   }
 
-  async updateProfileName(name: string) {
-    await this.page.locator('[data-test="update-account-name-form"] input').fill(name);
-    await this.page.locator('[data-test="update-account-name-form"] button').click();
+  async updateName(name: string) {
+    await this.page.fill('[data-test="update-account-name-form"] input', name);
+    await this.page.click('[data-test="update-account-name-form"] button');
   }
 
-  async updateProfileEmail(email: string) {
-    await this.page.locator('[data-test="account-email-form-email-input"]').fill(email);
-    await this.page.locator('[data-test="account-email-form-repeat-email-input"]').fill(email);
-    await this.page.locator('[data-test="account-email-form"] button').click();
+  async updateEmail(email: string) {
+    await this.page.fill('[data-test="account-email-form-email-input"]', email);
+    await this.page.fill('[data-test="account-email-form-repeat-email-input"]', email);
+    await this.page.click('[data-test="account-email-form"] button');
+  }
+
+  async updatePassword(password: string) {
+    await this.page.fill('[data-test="account-password-form-password-input"]', password);
+    await this.page.fill('[data-test="account-password-form-repeat-password-input"]', password);
+    await this.page.click('[data-test="account-password-form"] button');
+  }
+
+  async deleteAccount() {
+    await this.page.click('[data-test="delete-account-button"]');
+    await this.page.fill('[data-test="delete-account-input-field"]', 'DELETE');
+    await this.page.click('[data-test="confirm-delete-account-button"]');
   }
 
   getProfileName() {
diff --git a/apps/e2e/tests/account/account.spec.ts b/apps/e2e/tests/account/account.spec.ts
index 1c06dc000..7692a90c5 100644
--- a/apps/e2e/tests/account/account.spec.ts
+++ b/apps/e2e/tests/account/account.spec.ts
@@ -10,12 +10,12 @@ test.describe('Account Settings', () => {
     account = new AccountPageObject(page);
 
     await account.setup();
-  })
+  });
 
   test('user can update their profile name', async () => {
     const name = 'John Doe';
 
-    await account.updateProfileName(name);
+    await account.updateName(name);
 
     await page.waitForResponse((resp) => {
       return resp.url().includes('accounts');
@@ -27,7 +27,7 @@ test.describe('Account Settings', () => {
   test('user can update their email', async () => {
     const email = account.auth.createRandomEmail();
 
-    await account.updateProfileEmail(email);
+    await account.updateEmail(email);
 
     const req = await page.waitForResponse((resp) => {
       return resp.url().includes('auth/v1/user');
@@ -35,4 +35,36 @@ test.describe('Account Settings', () => {
 
     expect(req.status()).toBe(200);
   });
+
+  test('user can update their password', async () => {
+    const password = (Math.random() * 1000).toString();
+
+    await account.updatePassword(password);
+
+    await page.waitForResponse((resp) => {
+      return resp.url().includes('auth/v1/user');
+    });
+
+    await account.auth.signOut();
+  });
+});
+
+test.describe('Account Deletion', () => {
+  let page: Page;
+  let account: AccountPageObject;
+
+  test.beforeAll(async ({ browser }) => {
+    page = await browser.newPage();
+    account = new AccountPageObject(page);
+
+    await account.setup();
+  });
+
+  test('user can delete their own account', async () => {
+    await account.deleteAccount();
+
+    await page.waitForURL('http://localhost:3000');
+
+    expect(page.url()).toEqual('http://localhost:3000/');
+  });
 });
\ No newline at end of file
diff --git a/apps/e2e/tests/authentication/auth.po.ts b/apps/e2e/tests/authentication/auth.po.ts
index c01776b07..1b0342005 100644
--- a/apps/e2e/tests/authentication/auth.po.ts
+++ b/apps/e2e/tests/authentication/auth.po.ts
@@ -22,6 +22,11 @@ export class AuthPageObject {
     });
   }
 
+  async signOut() {
+    await this.page.click('[data-test="account-dropdown-trigger"]');
+    await this.page.click('[data-test="account-dropdown-sign-out"]');
+  }
+
   async signIn(params: {
     email: string,
     password: string
diff --git a/apps/e2e/tests/authentication/auth.spec.ts b/apps/e2e/tests/authentication/auth.spec.ts
index 620df8a90..1e21835af 100644
--- a/apps/e2e/tests/authentication/auth.spec.ts
+++ b/apps/e2e/tests/authentication/auth.spec.ts
@@ -26,6 +26,8 @@ test.describe('Auth flow', () => {
 
     await auth.visitConfirmEmailLink(email);
 
+    await page.waitForURL('http://localhost:3000/home');
+
     expect(page.url()).toContain('http://localhost:3000/home');
   });
 
@@ -40,9 +42,13 @@ test.describe('Auth flow', () => {
       password: 'password',
     });
 
-    await page.waitForTimeout(500);
+    await page.waitForURL('http://localhost:3000/home');
 
     expect(page.url()).toContain('/home');
+
+    await auth.signOut();
+
+    expect(page.url()).toContain('/');
   });
 });
 
diff --git a/apps/e2e/tests/utils/mailbox.ts b/apps/e2e/tests/utils/mailbox.ts
index 32db5b687..b7c0297ac 100644
--- a/apps/e2e/tests/utils/mailbox.ts
+++ b/apps/e2e/tests/utils/mailbox.ts
@@ -47,6 +47,11 @@ export class Mailbox {
     const url = `http://localhost:54324/api/v1/mailbox/${mailbox}`;
 
     const response = await fetch(url);
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch emails: ${response.statusText}`);
+    }
+
     const json = (await response.json()) as Array<{ id: string }>;
 
     if (!json || !json.length) {
diff --git a/packages/features/accounts/src/components/personal-account-dropdown.tsx b/packages/features/accounts/src/components/personal-account-dropdown.tsx
index ec59020b4..0c72c1e67 100644
--- a/packages/features/accounts/src/components/personal-account-dropdown.tsx
+++ b/packages/features/accounts/src/components/personal-account-dropdown.tsx
@@ -67,7 +67,7 @@ export function PersonalAccountDropdown({
     <DropdownMenu>
       <DropdownMenuTrigger
         aria-label="Open your profile menu"
-        data-test={'profile-dropdown-trigger'}
+        data-test={'account-dropdown-trigger'}
         className={cn(
           'animate-in fade-in group flex cursor-pointer items-center focus:outline-none',
           className ?? '',
@@ -179,6 +179,7 @@ export function PersonalAccountDropdown({
         <DropdownMenuSeparator />
 
         <DropdownMenuItem
+          data-test={'account-dropdown-sign-out'}
           role={'button'}
           className={'cursor-pointer'}
           onClick={signOutRequested}
diff --git a/packages/features/accounts/src/components/personal-account-settings/account-danger-zone.tsx b/packages/features/accounts/src/components/personal-account-settings/account-danger-zone.tsx
index 312eb2cd0..5e9f1f9bc 100644
--- a/packages/features/accounts/src/components/personal-account-settings/account-danger-zone.tsx
+++ b/packages/features/accounts/src/components/personal-account-settings/account-danger-zone.tsx
@@ -84,6 +84,7 @@ function DeleteAccountForm() {
   return (
     <Form {...form}>
       <form
+        data-test={'delete-account-form'}
         action={deletePersonalAccountAction}
         className={'flex flex-col space-y-4'}
       >
diff --git a/packages/features/accounts/src/components/personal-account-settings/password/update-password-form.tsx b/packages/features/accounts/src/components/personal-account-settings/password/update-password-form.tsx
index 8019a3e84..9b82dc1e0 100644
--- a/packages/features/accounts/src/components/personal-account-settings/password/update-password-form.tsx
+++ b/packages/features/accounts/src/components/personal-account-settings/password/update-password-form.tsx
@@ -93,7 +93,7 @@ export const UpdatePasswordForm = ({
   return (
     <Form {...form}>
       <form
-        data-test={'update-password-form'}
+        data-test={'account-password-form'}
         onSubmit={form.handleSubmit(updatePasswordCallback)}
       >
         <div className={'flex flex-col space-y-4'}>
@@ -118,7 +118,7 @@ export const UpdatePasswordForm = ({
 
                   <FormControl>
                     <Input
-                      data-test={'new-password'}
+                      data-test={'account-password-form-password-input'}
                       required
                       type={'password'}
                       {...field}
@@ -144,7 +144,7 @@ export const UpdatePasswordForm = ({
 
                   <FormControl>
                     <Input
-                      data-test={'repeat-password'}
+                      data-test={'account-password-form-repeat-password-input'}
                       required
                       type={'password'}
                       {...field}
diff --git a/turbo/generators/config.ts b/turbo/generators/config.ts
index 3ceb276a7..eb864d0da 100644
--- a/turbo/generators/config.ts
+++ b/turbo/generators/config.ts
@@ -3,7 +3,7 @@ import type { PlopTypes } from "@turbo/gen";
 
 export default function generator(plop: PlopTypes.NodePlopAPI): void {
   plop.setGenerator("init", {
-    description: "Generate a new package for the Acme Monorepo",
+    description: "Generate a new package for the Monorepo",
     prompts: [
       {
         type: "input",