diff --git a/client/modules/User/pages/AccountView.jsx b/client/modules/User/pages/AccountView.jsx
index 55b353d3..54157061 100644
--- a/client/modules/User/pages/AccountView.jsx
+++ b/client/modules/User/pages/AccountView.jsx
@@ -9,12 +9,27 @@ import { updateSettings, initiateVerification, createApiKey, removeApiKey } from
 import AccountForm from '../components/AccountForm';
 import { validateSettings } from '../../../utils/reduxFormUtils';
 import GithubButton from '../components/GithubButton';
+import GoogleButton from '../components/GoogleButton';
 import APIKeyForm from '../components/APIKeyForm';
 import Nav from '../../../components/Nav';
 
 const __process = (typeof global !== 'undefined' ? global : window).process;
 const ROOT_URL = __process.env.API_URL;
 
+function SocialLoginPanel(props) {
+  return (
+    <React.Fragment>
+      <AccountForm {...props} />
+      <h2 className="form-container__divider">Social Login</h2>
+      <p className="account__social-text">
+        Use your GitHub or Google account to log into the p5.js Web Editor.
+      </p>
+      <GithubButton buttonText="Login with GitHub" />
+      <GoogleButton buttonText="Login with Google" />
+    </React.Fragment>
+  );
+}
+
 class AccountView extends React.Component {
   componentDidMount() {
     document.body.className = this.props.theme;
@@ -44,28 +59,14 @@ class AccountView extends React.Component {
                 </div>
               </TabList>
               <TabPanel>
-                <AccountForm {...this.props} />
-                <h2 className="form-container__divider">Social Login</h2>
-                <p className="account__social-text">
-                  Link this account with your GitHub account to allow login from both.
-                </p>
-                <GithubButton buttonText="Login with GitHub" />
+                <SocialLoginPanel {...this.props} />
               </TabPanel>
               <TabPanel>
                 <APIKeyForm {...this.props} />
               </TabPanel>
             </Tabs>
           }
-          {!accessTokensUIEnabled &&
-            <div>
-              <AccountForm {...this.props} />
-              <h2 className="form-container__divider">Social Login</h2>
-              <p className="account__social-text">
-                Link this account with your GitHub account to allow login from both.
-              </p>
-              <GithubButton buttonText="Login with GitHub" />
-            </div>
-          }
+          { !accessTokensUIEnabled && <SocialLoginPanel {...this.props} /> }
         </section>
       </div>
     );
diff --git a/client/styles/components/_account.scss b/client/styles/components/_account.scss
index a8d9dd44..e4a0f837 100644
--- a/client/styles/components/_account.scss
+++ b/client/styles/components/_account.scss
@@ -3,6 +3,7 @@
     color: getThemifyVariable('primary-text-color');
     background-color: getThemifyVariable('background-color');
   }
+  height: 100%;
 }
 
 .account-settings {
diff --git a/client/styles/components/_github-button.scss b/client/styles/components/_github-button.scss
index 385afaa9..23fe0571 100644
--- a/client/styles/components/_github-button.scss
+++ b/client/styles/components/_github-button.scss
@@ -1,28 +1,4 @@
-.github-button {
-  @include themify() {
-    @extend %button;
-    & path {
-      color: getThemifyVariable('primary-text-color');
-    }
-    &:hover path, &:active path {
-      fill: $white;
-    }
-    &:hover, &:active {
-      background-color: getThemifyVariable('secondary-text-color');
-      border-color: getThemifyVariable('secondary-text-color');
-    }
-  }
-  width: #{300 / $base-font-size}rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.github-icon {
-  margin-right: #{10 / $base-font-size}rem;
-}
-
-
+.github-button,
 .google-button {
   @include themify() {
     @extend %button;
@@ -33,16 +9,23 @@
       fill: $white;
     }
     &:hover, &:active {
-      background-color: getThemifyVariable('secondary-text-color');
-      border-color: getThemifyVariable('secondary-text-color');
+      color: getThemifyVariable('button-hover-color');
+      background-color: getThemifyVariable('button-background-hover-color');
+      border-color: getThemifyVariable('button-background-hover-color');
     }
   }
-  margin-top: #{4 / $base-font-size}rem;
+  width: #{300 / $base-font-size}rem;
   display: flex;
-  flex-direction: row;
   justify-content: center;
   align-items: center;
-  width: #{300 / $base-font-size}rem;
+
+  & + & {
+    margin-top: #{10 / $base-font-size}rem;
+  }
+}
+
+.github-icon {
+  margin-right: #{10 / $base-font-size}rem;
 }
 
 .google-icon {