diff --git a/src/routes/(public)/(guest)/login/+page.svelte b/src/routes/(public)/(guest)/login/+page.svelte
index e9f8f25b4d..396b60a18d 100644
--- a/src/routes/(public)/(guest)/login/+page.svelte
+++ b/src/routes/(public)/(guest)/login/+page.svelte
@@ -94,6 +94,18 @@
     <svelte:fragment>
         <Form onSubmit={login}>
             <Layout.Stack>
+                {#if isCloud}
+                    <Button
+                        class="auth-provider-button"
+                        secondary
+                        fullWidth
+                        on:click={onGithubLogin}
+                        {disabled}>
+                        <span class="icon-github" aria-hidden="true"></span>
+                        <span class="text">Sign in with GitHub</span>
+                    </Button>
+                    <span class="with-separators eyebrow-heading-3">or</span>
+                {/if}
                 <InputEmail
                     id="email"
                     label="Email"
@@ -108,13 +120,6 @@
                     required={true}
                     bind:value={pass} />
                 <Button fullWidth submit {disabled}>Sign in</Button>
-                {#if isCloud}
-                    <span class="with-separators eyebrow-heading-3">or</span>
-                    <Button secondary fullWidth on:click={onGithubLogin} {disabled}>
-                        <span class="icon-github" aria-hidden="true"></span>
-                        <span class="text">Sign in with GitHub</span>
-                    </Button>
-                {/if}
             </Layout.Stack>
         </Form>
     </svelte:fragment>
@@ -129,3 +134,9 @@
         </li>
     </svelte:fragment>
 </Unauthenticated>
+
+<style>
+    :global(.auth-provider-button) {
+        margin-bottom: var(--gap-s, 8px);
+    }
+</style>
diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte
index aafbbd2b66..d07a552e80 100644
--- a/src/routes/(public)/(guest)/register/+page.svelte
+++ b/src/routes/(public)/(guest)/register/+page.svelte
@@ -124,6 +124,19 @@
     <svelte:fragment>
         <Form onSubmit={register}>
             <Layout.Stack>
+                {#if isCloud}
+                    <Button
+                        class="auth-provider-button"
+                        secondary
+                        fullWidth
+                        on:click={onGithubLogin}
+                        disabled={disabled || !terms}>
+                        <span class="icon-github" aria-hidden="true"></span>
+                        <span class="text">Sign up with GitHub</span>
+                    </Button>
+                    <span class="with-separators eyebrow-heading-3">or</span>
+                {/if}
+
                 <InputText
                     id="name"
                     label="Name"
@@ -159,18 +172,6 @@
                     >.</InputChoice>
 
                 <Button fullWidth submit disabled={disabled || !terms}>Sign up</Button>
-
-                {#if isCloud}
-                    <span class="with-separators eyebrow-heading-3">or</span>
-                    <Button
-                        secondary
-                        fullWidth
-                        on:click={onGithubLogin}
-                        disabled={disabled || !terms}>
-                        <span class="icon-github" aria-hidden="true"></span>
-                        <span class="text">Sign up with GitHub</span>
-                    </Button>
-                {/if}
             </Layout.Stack>
         </Form>
     </svelte:fragment>
@@ -181,3 +182,9 @@
         </Typography.Text>
     </svelte:fragment>
 </Unauthenticated>
+
+<style>
+    :global(.auth-provider-button) {
+        margin-bottom: var(--gap-s, 8px);
+    }
+</style>