2 files changed, 13 insertions(+), 2 deletions(-)

M app/internal_packages/onboarding/lib/account-providers.tsx
M app/internal_packages/onboarding/lib/onboarding-store.ts

@@ 4,6 4,17 @@ const AccountProviders = [
   {
     provider: 'gmail',
     displayName: 'Gmail or G Suite',
+    note: (
+      <span>
+        <strong>{localized('Important')}:</strong>{' '}
+        {localizedReactFragment(
+          'We recommend that you create a unique app password for email apps like Mailspring. Follow %@ to create one and then paste it below.',
+          <a href="https://support.google.com/accounts/answer/185833?hl=en">
+            {localized('these instructions')}
+          </a>
+        )}
+      </span>
+    ),
     icon: 'ic-settings-account-gmail.png',
     headerIcon: 'setup-icon-provider-gmail.png',
     color: '#e99999',

@@ 34,7 34,7 @@ class OnboardingStore extends MailspringStore {
       // to the best page with the most details
       this._account = new Account({}).fromJSON(existingAccountJSON);
       if (this._account.provider === 'gmail') {
-        this._pageStack = ['account-choose', 'account-settings-gmail'];
+        this._pageStack = ['account-choose', 'account-settings'];
       } else if (this._account.provider === 'imap') {
         this._pageStack = ['account-choose', 'account-settings', 'account-settings-imap'];
       } else {


@@ 71,7 71,7 @@ class OnboardingStore extends MailspringStore {
   };
 
   _onChooseAccountProvider = provider => {
-    const nextPage = provider === 'gmail' ? 'account-settings-gmail' : 'account-settings';
+    const nextPage = 'account-settings';
 
     // Don't carry over any type-specific account information
     this._onSetAccount(