diff --git a/src/routes/(public)/(guest)/login/+page.svelte b/src/routes/(public)/(guest)/login/+page.svelte
index e9f8f25b4d..529fcf685e 100644
--- a/src/routes/(public)/(guest)/login/+page.svelte
+++ b/src/routes/(public)/(guest)/login/+page.svelte
@@ -94,6 +94,15 @@
     <svelte:fragment>
         <Form onSubmit={login}>
             <Layout.Stack>
+                {#if isCloud}
+                    <div style:margin-bottom="var(--gap-s, 8px)">
+                        <Button secondary fullWidth on:click={onGithubLogin} {disabled}>
+                            <span class="icon-github" aria-hidden="true"></span>
+                            <span class="text">Sign in with GitHub</span>
+                        </Button>
+                    </div>
+                    <span class="with-separators eyebrow-heading-3">or</span>
+                {/if}
                 <InputEmail
                     id="email"
                     label="Email"
@@ -108,13 +117,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>
diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte
index aafbbd2b66..ec7608b13c 100644
--- a/src/routes/(public)/(guest)/register/+page.svelte
+++ b/src/routes/(public)/(guest)/register/+page.svelte
@@ -106,9 +106,17 @@
     }
 
     function onGithubLogin() {
+        let successUrl = window.location.origin;
+
+        if (page.url.searchParams.has('code')) {
+            successUrl += `?code=${page.url.searchParams.get('code')}`;
+        } else if (page.url.searchParams.has('campaign')) {
+            successUrl += `?campaign=${page.url.searchParams.get('campaign')}`;
+        }
+
         sdk.forConsole.account.createOAuth2Session({
             provider: OAuthProvider.Github,
-            success: window.location.origin,
+            success: successUrl,
             failure: window.location.origin,
             scopes: ['read:user', 'user:email']
         });
@@ -124,6 +132,16 @@
     <svelte:fragment>
         <Form onSubmit={register}>
             <Layout.Stack>
+                {#if isCloud}
+                    <div style:margin-bottom="var(--gap-s, 8px)">
+                        <Button secondary fullWidth on:click={onGithubLogin} {disabled}>
+                            <span class="icon-github" aria-hidden="true"></span>
+                            <span class="text">Sign up with GitHub</span>
+                        </Button>
+                    </div>
+                    <span class="with-separators eyebrow-heading-3">or</span>
+                {/if}
+
                 <InputText
                     id="name"
                     label="Name"
@@ -159,18 +177,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>