diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index 44cf5aed2..40063faf3 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -108,8 +108,8 @@
         }
     }
 
-    function onSubmit() {
-        // This is required by the Modal component but we handle clicks directly
+    async function onSubmit() {
+        await sendVerificationEmail();
     }
 
     async function updateEmailVerification() {
@@ -159,7 +159,7 @@
             dismissible={false}
             autoClose={false}>
             <Card.Base variant="secondary" padding="s">
-                <Layout.Stack gap="s">
+                <Layout.Stack gap="xxs">
                     <Typography.Text gap="m">
                         To continue using Appwrite Cloud, please verify your email address. An email
                         will be sent to <Typography.Text
@@ -167,8 +167,11 @@
                             color="neutral-secondary"
                             style="display: inline;">{get(user)?.email}</Typography.Text>
                     </Typography.Text>
-                    <Layout.Stack direction="row" gap="xxs">
-                        <Link variant="default" on:click={() => logout(false)}>Switch account</Link>
+                    <Layout.Stack class="u-margin-block-start-4 u-margin-block-end-24">
+                        <Layout.Stack direction="row">
+                            <Link variant="default" on:click={() => logout(false)}
+                                >Switch account</Link>
+                        </Layout.Stack>
                     </Layout.Stack>
                     {#if emailSent && resendTimer > 0}
                         <Typography.Text color="neutral-secondary">
@@ -179,7 +182,7 @@
             </Card.Base>
 
             <svelte:fragment slot="footer">
-                <Button on:click={sendVerificationEmail} disabled={creating || resendTimer > 0}>
+                <Button submit disabled={creating || resendTimer > 0}>
                     {emailSent ? 'Resend email' : 'Send email'}
                 </Button>
             </svelte:fragment>
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 6c61e0c7e..83643eeb9 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -367,4 +367,6 @@
 {/if}
 
 <BottomModalAlert />
-<SendVerificationEmailModal />
+{#if !page.url.pathname.includes('/console/verify-email')}
+    <SendVerificationEmailModal />
+{/if}
diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
index a17fab8bd..dec0b5b4b 100644
--- a/src/routes/(console)/verify-email/+page.svelte
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -116,7 +116,7 @@
         }
 
         const interval = setInterval(async () => {
-            await invalidate('user');
+            await invalidate(Dependencies.ACCOUNT);
             checkEmailVerification();
         }, 2000);