diff --git a/internal_packages/onboarding/lib/onboarding-helpers.es6 b/internal_packages/onboarding/lib/onboarding-helpers.es6
index 3df967ba4..884df9a53 100644
--- a/internal_packages/onboarding/lib/onboarding-helpers.es6
+++ b/internal_packages/onboarding/lib/onboarding-helpers.es6
@@ -60,6 +60,7 @@ export function makeGmailOAuthRequest(sessionKey, callback) {
               provider: 'gmail',
               settings: {
                 xoauth2: remoteJSON.resolved_settings.xoauth2,
+                expiry_date: remoteJSON.resolved_settings.expiry_date,
               },
             },
             success: (localJSON) => {
diff --git a/src/n1-cloud-api.es6 b/src/n1-cloud-api.es6
index 766802bf6..31810d628 100644
--- a/src/n1-cloud-api.es6
+++ b/src/n1-cloud-api.es6
@@ -10,6 +10,8 @@ class N1CloudAPI {
     const env = NylasEnv.config.get('env')
     if (['development', 'local'].includes(env)) {
       this.APIRoot = "http://localhost:5100";
+    } else if (env === 'staging') {
+      this.APIRoot = "https://n1-staging.us-east-1.elasticbeanstalk.com/";
     } else {
       this.APIRoot = "https://n1.nylas.com";
     }