diff --git a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
index b68ad85752..0b4ab35e45 100644
--- a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
@@ -1,24 +1,32 @@
 <script>
+  import { onMount } from "svelte"
   import { ActionButton } from "@budibase/bbui"
   import GoogleLogo from "/assets/google-logo.png"
+
+  let show = false
+
+  async function fetchConfig() {
+    const googleResponse = await api.get(
+      `/api/admin/configs/${ConfigTypes.Google}`
+    )
+    const googleDoc = await googleResponse.json()
+
+    if (googleDoc._id) show = true 
+  }
 </script>
 
-<ActionButton>
-  <a target="_blank" href="/api/admin/auth/google">
-    <div class="inner">
-      <img src={GoogleLogo} alt="google icon" />
-      <p>Sign in with Google</p>
-    </div>
-  </a>
-</ActionButton>
+{#if show}
+  <ActionButton>
+    <a target="_blank" href="/api/admin/auth/google">
+      <div class="inner">
+        <img src={GoogleLogo} alt="google icon" />
+        <p>Sign in with Google</p>
+      </div>
+    </a>
+  </ActionButton>
+{/if}
 
 <style>
-  .outer {
-    border: 1px solid #494949;
-    border-radius: 4px;
-    width: 100%;
-    background-color: var(--background-alt);
-  }
   .inner {
     display: flex;
     flex-direction: row;
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 076813b6e9..1cc032fb2c 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -38,8 +38,13 @@
       notifications.error("Invalid credentials")
     }
   }
+
+  function handleKeydown(evt) {
+    if (evt.key === "Enter") login()
+  }
 </script>
 
+<svelte:window on:keydown={handleKeydown} />
 <div class="login">
   <div class="main">
     <Layout>