diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 3d1175654..41fdcaf92 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v2.7.1]
+
+### Enhancements
+
+- Updated new account signup flow [#2695](https://github.com/Automattic/simplenote-electron/pull/2695)
+
 ## [v2.7.0]
 
 ### Enhancements
diff --git a/desktop/app.js b/desktop/app.js
index 5018dfe93..f83e720e6 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -32,7 +32,11 @@ module.exports = function main() {
     setTimeout(updater.ping.bind(updater), config.updater.delay);
     app.on('open-url', function (event, url) {
       event.preventDefault();
-      mainWindow.webContents.send('wpLogin', url);
+      if (url.startsWith('simplenote://auth')) {
+        mainWindow.webContents.send('wpLogin', url);
+      } else if (url.startsWith('simplenote://login')) {
+        mainWindow.webContents.send('tokenLogin', url);
+      }
     });
   });
 
@@ -211,7 +215,11 @@ module.exports = function main() {
     // Protocol handler for platforms other than macOS
     // argv: An array of the second instance’s (command line / deep linked) arguments
     // The last index of argv is the full deeplink url (simplenote://SOME_URL)
-    mainWindow.webContents.send('wpLogin', argv[argv.length - 1]);
+    if (argv[argv.length - 1].startsWith('simplenote://auth')) {
+      mainWindow.webContents.send('wpLogin', argv[argv.length - 1]);
+    } else if (argv[argv.length - 1].startsWith('simplenote://login')) {
+      mainWindow.webContents.send('tokenLogin', argv[argv.length - 1]);
+    }
   });
 
   if (!gotTheLock) {
diff --git a/desktop/preload.js b/desktop/preload.js
index 7e9df9f15..b61aa5a70 100644
--- a/desktop/preload.js
+++ b/desktop/preload.js
@@ -10,6 +10,7 @@ const validChannels = [
   'noteImportChannel',
   'reallyCloseWindow',
   'setAutoHideMenuBar',
+  'tokenLogin',
   'wpLogin',
 ];
 
diff --git a/lib/alternate-login-prompt/index.tsx b/lib/alternate-login-prompt/index.tsx
new file mode 100644
index 000000000..dc26411d5
--- /dev/null
+++ b/lib/alternate-login-prompt/index.tsx
@@ -0,0 +1,103 @@
+import React, { FunctionComponent } from 'react';
+import classNames from 'classnames';
+import Modal from 'react-modal';
+import { connect } from 'react-redux';
+
+import CrossIcon from '../icons/cross';
+import WarningIcon from '../icons/warning';
+
+import actions from '../state/actions';
+
+import * as selectors from '../state/selectors';
+import * as S from '../state';
+
+type StateProps = {
+  alternateLoginEmail: string | null;
+  email: string | null;
+  theme: 'light' | 'dark';
+};
+
+type DispatchProps = {
+  logout: () => any;
+  dismiss: () => any;
+};
+
+type Props = StateProps & DispatchProps;
+
+const AlternateLoginPrompt: FunctionComponent<Props> = ({
+  alternateLoginEmail,
+  dismiss,
+  email,
+  logout,
+  theme,
+}) => {
+  const displayClose = (
+    <div className="alternate-login__dismiss">
+      <button
+        className="icon-button"
+        aria-label="Close dialog"
+        onClick={dismiss}
+      >
+        <CrossIcon />
+      </button>
+    </div>
+  );
+
+  const displayAlternateLoginPrompt = (
+    <>
+      {displayClose}
+      <span className="theme-color-fg-dim">
+        <WarningIcon />
+      </span>
+      <h2>Logout?</h2>
+      <p>You are already logged in as:</p>
+      <p className="alternate-login__email">
+        <strong>{email}</strong>
+      </p>
+      <p>You tried logging in with:</p>
+      <p className="alternate-login__email">
+        <strong>{alternateLoginEmail}</strong>
+      </p>
+      <p>Would you like to log out?</p>
+
+      <div className="alternate-login__button-row button-borderless">
+        <a target="_blank" rel="noreferrer" onClick={dismiss}>
+          <button className="button button-borderless">Cancel</button>
+        </a>
+        <a target="_blank" rel="noreferrer" onClick={logout}>
+          <button className="button button-primary">Logout</button>
+        </a>
+      </div>
+    </>
+  );
+
+  return (
+    <Modal
+      key="alternate-login"
+      className="alternate-login__modal theme-color-fg theme-color-bg"
+      isOpen
+      onRequestClose={dismiss}
+      contentLabel="Log out?"
+      overlayClassName="alternate-login__overlay"
+      portalClassName={classNames('alternate-login__portal', 'theme-' + theme)}
+    >
+      {displayAlternateLoginPrompt}
+    </Modal>
+  );
+};
+
+const mapDispatchToProps: S.MapDispatch<DispatchProps> = {
+  dismiss: () => actions.ui.showAlternateLoginPrompt(false),
+  logout: actions.ui.logout,
+};
+
+const mapStateToProps: S.MapState<StateProps> = (state) => ({
+  alternateLoginEmail: state.ui.alternateLoginEmail,
+  email: state.settings.accountName,
+  theme: selectors.getTheme(state),
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AlternateLoginPrompt);
diff --git a/lib/alternate-login-prompt/style.scss b/lib/alternate-login-prompt/style.scss
new file mode 100644
index 000000000..596a1a1a1
--- /dev/null
+++ b/lib/alternate-login-prompt/style.scss
@@ -0,0 +1,81 @@
+.alternate-login__overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba($studio-gray-20, 0.75);
+}
+
+.alternate-login__dismiss {
+  display: flex;
+  height: 60px;
+  justify-content: flex-end;
+  align-items: center;
+  margin: 0 16px;
+  width: 100%;
+
+  svg {
+    height: 16px;
+    width: 16px;
+    margin: auto 0;
+  }
+}
+
+.alternate-login__email {
+  word-break: break-all;
+}
+
+.alternate-login__modal {
+  align-items: center;
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin: 20%;
+  max-width: 420px;
+  padding: 0 24px 16px;
+  font-size: 16px;
+
+  p {
+    margin: 0 26px;
+    margin-block-start: 0;
+  }
+
+  p:not(:last-of-type) {
+    padding-bottom: 20px;
+  }
+
+  .alternate-login__button-row {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    flex-wrap: wrap;
+    width: 100%;
+
+    a {
+      padding-right: 12px;
+    }
+    .button-borderless {
+      color: $studio-simplenote-blue-50;
+    }
+  }
+
+  &:focus {
+    outline: 0;
+  }
+}
+
+.theme-dark {
+  .alternate-login__overlay {
+    background: rgba($studio-gray-100, 0.75);
+  }
+  .alternate-login__button-row .button-borderless {
+    color: $studio-simplenote-blue-30;
+  }
+}
diff --git a/lib/app.tsx b/lib/app.tsx
index 013267122..de5eb664a 100644
--- a/lib/app.tsx
+++ b/lib/app.tsx
@@ -7,6 +7,7 @@ import AppLayout from './app-layout';
 import DevBadge from './components/dev-badge';
 import DialogRenderer from './dialog-renderer';
 import EmailVerification from './email-verification';
+import AlternateLoginPrompt from './alternate-login-prompt';
 import { isElectron, isMac } from './utils/platform';
 import classNames from 'classnames';
 import {
@@ -34,6 +35,7 @@ type StateProps = {
   isSmallScreen: boolean;
   lineLength: T.LineLength;
   isSearchActive: boolean;
+  showAlternateLoginPrompt: boolean;
   showEmailVerification: boolean;
   showNavigation: boolean;
   showNoteInfo: boolean;
@@ -162,6 +164,7 @@ class AppComponent extends Component<Props> {
     const {
       isDevConfig,
       lineLength,
+      showAlternateLoginPrompt,
       showEmailVerification,
       showNavigation,
       showNoteInfo,
@@ -183,6 +186,7 @@ class AppComponent extends Component<Props> {
     return (
       <div className={appClasses}>
         {showEmailVerification && <EmailVerification />}
+        {showAlternateLoginPrompt && <AlternateLoginPrompt />}
         {isDevConfig && <DevBadge />}
         <div className={mainClasses}>
           {showNavigation && <NavigationBar />}
@@ -201,6 +205,7 @@ const mapStateToProps: S.MapState<StateProps> = (state) => ({
   isSearchActive: !!state.ui.searchQuery.length,
   isSmallScreen: selectors.isSmallScreen(state),
   lineLength: state.settings.lineLength,
+  showAlternateLoginPrompt: state.ui.showAlternateLoginPrompt,
   showEmailVerification: selectors.shouldShowEmailVerification(state),
   showNavigation: state.ui.showNavigation,
   showNoteInfo: state.ui.showNoteInfo,
diff --git a/lib/auth/index.tsx b/lib/auth/index.tsx
index 544c7e245..96ae9e582 100644
--- a/lib/auth/index.tsx
+++ b/lib/auth/index.tsx
@@ -3,19 +3,21 @@ import classNames from 'classnames';
 import cryptoRandomString from '../utils/crypto-random-string';
 import { get } from 'lodash';
 import getConfig from '../../get-config';
+import MailIcon from '../icons/mail';
 import SimplenoteLogo from '../icons/simplenote';
 import Spinner from '../components/spinner';
-import { validatePassword } from '../utils/validate-password';
 import { isElectron, isMac } from '../utils/platform';
 import { viewExternalUrl } from '../utils/url-utils';
 
 type OwnProps = {
+  accountCreationRequested: boolean;
   authPending: boolean;
+  emailSentTo: string;
   hasInsecurePassword: boolean;
   hasInvalidCredentials: boolean;
   hasLoginError: boolean;
   login: (username: string, password: string) => any;
-  signup: (username: string, password: string) => any;
+  requestSignup: (username: string) => any;
   tokenLogin: (username: string, token: string) => any;
   resetErrors: () => any;
 };
@@ -60,14 +62,58 @@ export class Auth extends Component<Props> {
     const helpMessage = isCreatingAccount
       ? 'Already have an account?'
       : "Don't have an account?";
-    const errorMessage = isCreatingAccount
-      ? 'Could not create account. Please try again.'
-      : 'Could not log in with the provided email address and password.';
+
+    const errorMessage = isCreatingAccount ? (
+      <>
+        Could not request account creation. Please try again or
+        <a
+          href="mailto:support@simplenote.com?subject=Simplenote%20Support"
+          onClick={(event) => {
+            event.preventDefault();
+            viewExternalUrl(
+              'mailto:support@simplenote.com?subject=Simplenote%20Support'
+            );
+          }}
+        >
+          contact us
+        </a>
+        .
+      </>
+    ) : (
+      'Could not log in with the provided email address and password.'
+    );
 
     const mainClasses = classNames('login', {
       'is-electron': isElectron,
     });
 
+    if (this.props.accountCreationRequested) {
+      return (
+        <div className={mainClasses}>
+          {isElectron && isMac && <div className="login__draggable-area" />}
+          <div className="accountRequested">
+            <MailIcon />
+            <p className="accountRequested__message theme-color-fg">
+              We&apos;ve sent an email to{' '}
+              <strong>{this.props.emailSentTo}</strong>. Please check your inbox
+              and follow the instructions.
+            </p>
+            <p className="accountRequested__footer theme-color-fg-dim">
+              Didn&apos;t get an email? You may already have an account. Contact{' '}
+              <a href="mailto:support@simplenote.com">support@simplenote.com</a>{' '}
+              for help.
+            </p>
+            <button
+              onClick={this.clearRequestedAccount}
+              className="button-borderless"
+            >
+              Go Back
+            </button>
+          </div>
+        </div>
+      );
+    }
+
     return (
       <div className={mainClasses}>
         {isElectron && isMac && <div className="login__draggable-area" />}
@@ -132,26 +178,29 @@ export class Auth extends Component<Props> {
             required
             autoFocus
           />
-          <label
-            className="login__field theme-color-border"
-            htmlFor="login__field-password"
-          >
-            Password
-          </label>
-          <input
-            id="login__field-password"
-            onInput={this.onInput}
-            onInvalid={this.onInput}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            placeholder="Password"
-            ref={(ref) => (this.passwordInput = ref)}
-            spellCheck={false}
-            type="password"
-            required
-            minLength="4"
-          />
-
+          {!isCreatingAccount && (
+            <>
+              <label
+                className="login__field theme-color-border"
+                htmlFor="login__field-password"
+              >
+                Password
+              </label>
+              <input
+                id="login__field-password"
+                onInput={this.onInput}
+                onInvalid={this.onInput}
+                onFocus={this.onFocus}
+                onBlur={this.onBlur}
+                placeholder="Password"
+                ref={(ref) => (this.passwordInput = ref)}
+                spellCheck={false}
+                type="password"
+                required
+                minLength={4}
+              />
+            </>
+          )}
           <button
             id="login__login-button"
             className={submitClasses}
@@ -254,24 +303,10 @@ export class Auth extends Component<Props> {
     if (event.currentTarget.className !== 'validate') {
       return;
     }
+  };
 
-    const passwordError =
-      'Sorry, that password is not strong enough. Passwords must be at least 8 characters long and may not match your email address.';
-
-    if (this.state.isCreatingAccount) {
-      const username = get(this.usernameInput, 'value');
-      const password = get(this.passwordInput, 'value');
-
-      // run custom validation for the password but use the default message for missing value
-      if (
-        this.passwordInput.validity.valueMissing ||
-        validatePassword(password, username)
-      ) {
-        this.passwordInput.setCustomValidity('');
-      } else {
-        this.passwordInput.setCustomValidity(passwordError);
-      }
-    }
+  clearRequestedAccount = () => {
+    this.props.resetErrors();
   };
 
   onSubmit = (event) => {
@@ -283,7 +318,15 @@ export class Auth extends Component<Props> {
       passwordErrorMessage: '',
     });
 
-    if (
+    // make sure all existing form fields are filled out
+    if (!this.passwordInput) {
+      if (this.usernameInput.validity.valueMissing) {
+        this.setState({
+          passwordErrorMessage: 'Please fill out email.',
+        });
+        return;
+      }
+    } else if (
       this.usernameInput.validity.valueMissing ||
       this.passwordInput.validity.valueMissing
     ) {
@@ -302,37 +345,24 @@ export class Auth extends Component<Props> {
     }
 
     const username = get(this.usernameInput, 'value');
-    const password = get(this.passwordInput, 'value');
-    const passwordError =
-      'Sorry, that password is not strong enough. Passwords must be at least 8 characters long and may not match your email address.';
 
-    // signup - stricter password requirements apply
     if (this.state.isCreatingAccount) {
-      if (!validatePassword(password, username)) {
-        this.setState({
-          passwordErrorMessage: passwordError,
-        });
-        this.passwordInput.setCustomValidity(passwordError);
-        return;
-      }
-
-      this.passwordInput.setCustomValidity('');
-      this.props.signup(username, password, true);
+      this.props.requestSignup(username);
+      return;
     }
 
-    // login - slightly more relaxed password rules
-    else {
-      if (!this.passwordInput.validity.valid) {
-        this.setState({
-          passwordErrorMessage: 'Passwords must contain at least 4 characters.',
-        });
-        return;
-      }
+    const password = get(this.passwordInput, 'value');
 
-      this.props.login(username, password);
+    // login has slightly more relaxed password rules
+    if (!this.passwordInput.validity.valid) {
+      this.setState({
+        passwordErrorMessage: 'Passwords must contain at least 4 characters.',
+      });
+      return;
     }
 
     this.setState({ passwordErrorMessage: null });
+    this.props.login(username, password);
   };
 
   onWPLogin = () => {
@@ -351,7 +381,7 @@ export class Auth extends Component<Props> {
         : false;
       const authState = searchParams.get('state');
       const userEmail = searchParams.get('user');
-      const simpToken = searchParams.get('token');
+      const simperiumToken = searchParams.get('token');
       const wpccToken = searchParams.get('wp_token');
 
       // Display an error message if authorization failed.
@@ -373,7 +403,7 @@ export class Auth extends Component<Props> {
       if (authState !== this.authState) {
         return;
       }
-      this.props.tokenLogin(userEmail, simpToken);
+      this.props.tokenLogin(userEmail, simperiumToken);
     });
   };
 
diff --git a/lib/auth/style.scss b/lib/auth/style.scss
index e7e04be50..cc0407988 100644
--- a/lib/auth/style.scss
+++ b/lib/auth/style.scss
@@ -32,13 +32,15 @@
     text-align: center;
   }
 
-  .login__auth-message.is-error {
-    color: $studio-red-60;
+  .login__auth-message {
     font-size: 16px;
     margin: 0 auto 16px;
     max-width: 347px;
     text-align: center;
     width: 90%;
+    .is-error {
+      color: $studio-red-60;
+    }
   }
 
   label {
@@ -61,6 +63,10 @@
     font-weight: 400;
   }
 
+  .spinner {
+    vertical-align: middle;
+  }
+
   button[type='submit'] {
     background-color: $studio-simplenote-blue-50;
     border: none;
@@ -87,6 +93,7 @@
   }
 
   .login__signup a,
+  .login__auth-message a,
   .terms a {
     color: $studio-simplenote-blue-50;
     margin-left: 5px;
@@ -135,6 +142,23 @@
   }
 }
 
+.accountRequested {
+  font-size: 16px;
+  line-height: 22px;
+  text-align: center;
+  width: 320px;
+
+  svg.icon-mail {
+    color: $studio-gray-50;
+    width: 60px;
+    height: 60px;
+  }
+  .accountRequested__footer {
+    font-size: 14px;
+    line-height: 20px;
+  }
+}
+
 .theme-dark .login {
   h1 {
     color: $studio-white;
@@ -150,6 +174,7 @@
   }
 
   .login__signup a,
+  .login__auth-message a,
   .terms a {
     color: $studio-simplenote-blue-30;
   }
@@ -165,4 +190,8 @@
   .or-line {
     border-color: $studio-gray-80;
   }
+
+  svg.icon-mail {
+    color: $studio-gray-30;
+  }
 }
diff --git a/lib/boot-with-auth.tsx b/lib/boot-with-auth.tsx
index a3f367d6a..023e55cd6 100644
--- a/lib/boot-with-auth.tsx
+++ b/lib/boot-with-auth.tsx
@@ -20,15 +20,11 @@ const config = getConfig();
 export const bootWithToken = (
   logout: () => any,
   token: string,
-  username: string | null,
-  createWelcomeNote: boolean
+  username: string | null
 ) => {
   Modal.setAppElement('#root');
 
-  makeStore(
-    username,
-    initSimperium(logout, token, username, createWelcomeNote)
-  ).then((store) => {
+  makeStore(username, initSimperium(logout, token, username)).then((store) => {
     Object.defineProperties(window, {
       dispatch: {
         get() {
diff --git a/lib/boot-without-auth.tsx b/lib/boot-without-auth.tsx
index bdebd52a5..390d7d6a1 100644
--- a/lib/boot-without-auth.tsx
+++ b/lib/boot-without-auth.tsx
@@ -13,16 +13,18 @@ import getConfig from '../get-config';
 import '../scss/style.scss';
 
 type Props = {
-  onAuth: (token: string, username: string, createWelcomeNote: boolean) => any;
+  onAuth: (token: string, username: string) => any;
 };
 
 type State = {
   authStatus:
+    | 'account-creation-requested'
     | 'unsubmitted'
     | 'submitting'
     | 'insecure-password'
     | 'invalid-credentials'
     | 'unknown-error';
+  emailSentTo: string;
   showAbout: boolean;
 };
 
@@ -30,23 +32,31 @@ type User = {
   access_token?: string;
 };
 
-const appProvider = 'simplenote.com';
 const config = getConfig();
 const auth = new SimperiumAuth(config.app_id, config.app_key);
 
 class AppWithoutAuth extends Component<Props, State> {
   state: State = {
     authStatus: 'unsubmitted',
+    emailSentTo: '',
     showAbout: false,
   };
 
   componentDidMount() {
     window.electron?.receive('appCommand', this.onAppCommand);
+
+    window.electron?.receive('tokenLogin', (url) => {
+      const { searchParams } = new URL(url);
+      const simperiumToken = searchParams.get('token');
+      const email = atob(searchParams.get('email'));
+      this.tokenLogin(email, simperiumToken);
+    });
   }
 
-  login(token: string, username: string, createWelcomeNote: boolean) {
+  login(token: string, username: string) {
     window.electron?.removeListener('appCommand');
-    this.props.onAuth(token, username, createWelcomeNote);
+    window.electron?.removeListener('tokenLogin');
+    this.props.onAuth(token, username);
   }
 
   onAppCommand = (event) => {
@@ -92,26 +102,32 @@ class AppWithoutAuth extends Component<Props, State> {
     });
   };
 
-  createUser = (usernameArg: string, password: string) => {
-    const username = usernameArg.trim().toLowerCase();
-    if (!(username && password)) {
+  requestSignup = (email: string) => {
+    const username = email.trim().toLowerCase();
+    if (!username) {
       return;
     }
 
-    this.setState({ authStatus: 'submitting' }, () => {
-      auth
-        .create(username, password, appProvider)
-        .then((user: User) => {
-          if (!user.access_token) {
-            throw new Error('missing access token');
+    this.setState({ authStatus: 'submitting' }, async () => {
+      try {
+        const response = await fetch(
+          'https://app.simplenote.com/account/request-signup',
+          {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ username: username }),
           }
-
-          recordEvent('user_account_created');
-          this.login(user.access_token, username, true);
-        })
-        .catch(() => {
+        );
+        if (response.ok) {
+          recordEvent('user_account_creation_requested');
+          this.setState({ authStatus: 'account-creation-requested' });
+          this.setState({ emailSentTo: username });
+        } else {
           this.setState({ authStatus: 'unknown-error' });
-        });
+        }
+      } catch {
+        this.setState({ authStatus: 'unknown-error' });
+      }
     });
   };
 
@@ -128,16 +144,22 @@ class AppWithoutAuth extends Component<Props, State> {
     return (
       <div className={`app theme-${systemTheme}`}>
         <AuthApp
+          accountCreationRequested={
+            this.state.authStatus === 'account-creation-requested'
+          }
           authPending={this.state.authStatus === 'submitting'}
+          emailSentTo={this.state.emailSentTo}
           hasInsecurePassword={this.state.authStatus === 'insecure-password'}
           hasInvalidCredentials={
             this.state.authStatus === 'invalid-credentials'
           }
           hasLoginError={this.state.authStatus === 'unknown-error'}
           login={this.authenticate}
-          signup={this.createUser}
           tokenLogin={this.tokenLogin}
-          resetErrors={() => this.setState({ authStatus: 'unsubmitted' })}
+          resetErrors={() =>
+            this.setState({ authStatus: 'unsubmitted', emailSentTo: '' })
+          }
+          requestSignup={this.requestSignup}
         />
         {this.state.showAbout && (
           <Modal
@@ -160,9 +182,7 @@ class AppWithoutAuth extends Component<Props, State> {
   }
 }
 
-export const boot = (
-  onAuth: (token: string, username: string, createWelcomeNote: boolean) => any
-) => {
+export const boot = (onAuth: (token: string, username: string) => any) => {
   Modal.setAppElement('#root');
   render(<AppWithoutAuth onAuth={onAuth} />, document.getElementById('root'));
 };
diff --git a/lib/boot.ts b/lib/boot.ts
index dc4ac152c..16ebf4510 100644
--- a/lib/boot.ts
+++ b/lib/boot.ts
@@ -171,11 +171,7 @@ if (!Array.prototype.findIndex) {
 }
 /* eslint-enable */
 
-const run = (
-  token: string | null,
-  username: string | null,
-  createWelcomeNote: boolean
-) => {
+const run = (token: string | null, username: string | null) => {
   if (token) {
     Promise.all([
       ensureNormalization(),
@@ -193,8 +189,7 @@ const run = (
           });
         },
         token,
-        username,
-        createWelcomeNote
+        username
       );
     });
   } else {
@@ -203,13 +198,11 @@ const run = (
         forceReload();
       }
     });
-    bootWithoutAuth(
-      (token: string, username: string, createWelcomeNote: boolean) => {
-        saveAccount(token, username);
-        run(token, username, createWelcomeNote);
-      }
-    );
+    bootWithoutAuth((token: string, username: string) => {
+      saveAccount(token, username);
+      run(token, username);
+    });
   }
 };
 
-run(storedToken, storedUsername, false);
+run(storedToken, storedUsername);
diff --git a/lib/global.d.ts b/lib/global.d.ts
index f7fd2d5ef..155aa830d 100644
--- a/lib/global.d.ts
+++ b/lib/global.d.ts
@@ -13,6 +13,7 @@ declare global {
       receive(command: 'appCommand', callback: (event: any) => any);
       receive(command: 'editorCommand', callback: (event: any) => any);
       receive(command: 'noteImportChannel', callback: (event: any) => any);
+      receive(command: 'tokenLogin', callback: (event: any) => any);
       receive(command: 'wpLogin', callback: (event: any) => any);
       removeListener(command: 'noteImportChannel');
       send(
diff --git a/lib/state/action-types.ts b/lib/state/action-types.ts
index 0be16bae6..65efa06de 100644
--- a/lib/state/action-types.ts
+++ b/lib/state/action-types.ts
@@ -72,6 +72,7 @@ export type FilterNotes = Action<
   { noteIds: T.EntityId[]; tagHashes: T.TagHash[] }
 >;
 export type FocusSearchField = Action<'FOCUS_SEARCH_FIELD'>;
+export type HideAlternateLoginPrompt = Action<'HIDE_ALTERNATE_LOGIN_PROMPT'>;
 export type Logout = Action<'LOGOUT'>;
 export type OpenNote = Action<'OPEN_NOTE', { noteId?: T.EntityId }>;
 export type OpenRevision = Action<
@@ -102,6 +103,11 @@ export type SetUnsyncedNoteIds = Action<
 >;
 export type ShowAllNotes = Action<'SHOW_ALL_NOTES'>;
 export type ShowDialog = Action<'SHOW_DIALOG', { dialog: T.DialogType }>;
+export type ShowAlternateLoginPrompt = Action<
+  'SHOW_ALTERNATE_LOGIN_PROMPT',
+  { email: string }
+>;
+export type ShowUntaggedNotes = Action<'SHOW_UNTAGGED_NOTES'>;
 export type StoreEditorSelection = Action<
   'STORE_EDITOR_SELECTION',
   { noteId: T.EntityId; start: number; end: number; direction: 'RTL' | 'LTR' }
@@ -337,6 +343,7 @@ export type ActionType =
   | GhostRemoveEntity
   | GhostSetChangeVersion
   | GhostSetEntity
+  | HideAlternateLoginPrompt
   | ImportNote
   | ImportNoteWithId
   | InsertTask
@@ -389,7 +396,9 @@ export type ActionType =
   | SetTheme
   | SetUnsyncedNoteIds
   | ShowAllNotes
+  | ShowAlternateLoginPrompt
   | ShowDialog
+  | ShowUntaggedNotes
   | StoreEditorSelection
   | StoreNumberOfMatchesInNote
   | StoreSearchSelection
diff --git a/lib/state/electron/middleware.ts b/lib/state/electron/middleware.ts
index 3a6034986..7de4140c7 100644
--- a/lib/state/electron/middleware.ts
+++ b/lib/state/electron/middleware.ts
@@ -7,6 +7,14 @@ import * as S from '../';
 const debug = debugFactory('electron-middleware');
 
 export const middleware: S.Middleware = ({ dispatch, getState }) => {
+  window.electron.receive('tokenLogin', (url) => {
+    const { searchParams } = new URL(url);
+    const tokenEmail = searchParams.get('email');
+    // if already logged in with the same account as the token, do nothing
+    if (tokenEmail !== getState().settings.accountName) {
+      dispatch(actions.ui.showAlternateLoginPrompt(tokenEmail));
+    }
+  });
   window.electron.receive('appCommand', (command) => {
     switch (command.action) {
       case 'closeWindow':
diff --git a/lib/state/simperium/middleware.ts b/lib/state/simperium/middleware.ts
index ddfdcfe5a..106274153 100644
--- a/lib/state/simperium/middleware.ts
+++ b/lib/state/simperium/middleware.ts
@@ -35,8 +35,7 @@ type Buckets = {
 export const initSimperium = (
   logout: () => any,
   token: string,
-  username: string | null,
-  createWelcomeNote: boolean
+  username: string | null
 ): S.Middleware => (store) => {
   const { dispatch, getState } = store;
 
@@ -231,26 +230,6 @@ export const initSimperium = (
     });
   });
 
-  if (createWelcomeNote) {
-    import(
-      /* webpackChunkName: 'welcome-message' */ '../../welcome-message'
-    ).then(({ content }) => {
-      const now = Date.now() / 1000;
-      store.dispatch(
-        actions.ui.createNote({
-          content,
-          deleted: false,
-          systemTags: [],
-          creationDate: now,
-          modificationDate: now,
-          shareURL: '',
-          publishURL: '',
-          tags: [],
-        })
-      );
-    });
-  }
-
   const noteQueue = new BucketQueue(noteBucket);
   const queueNoteUpdate = (noteId: T.EntityId, delay = 2000) =>
     noteQueue.add(noteId, Date.now() + delay);
diff --git a/lib/state/ui/actions.ts b/lib/state/ui/actions.ts
index bda9efd80..79bb28312 100644
--- a/lib/state/ui/actions.ts
+++ b/lib/state/ui/actions.ts
@@ -91,6 +91,20 @@ export const showDialog: A.ActionCreator<A.ShowDialog> = (
   dialog,
 });
 
+export const showAlternateLoginPrompt: A.ActionCreator<A.ShowAlternateLoginPrompt> = (
+  email: string
+) => ({
+  type: 'SHOW_ALTERNATE_LOGIN_PROMPT',
+  email,
+});
+
+export const hideAlternateLoginPrompt: A.ActionCreator<A.HideAlternateLoginPrompt> = (
+  email: string
+) => ({
+  type: 'HIDE_ALTERNATE_LOGIN_PROMPT',
+  email,
+});
+
 export const storeRevisions: A.ActionCreator<A.StoreRevisions> = (
   noteId: T.EntityId,
   revisions: T.NoteEntity[]
diff --git a/lib/state/ui/reducer.ts b/lib/state/ui/reducer.ts
index 245ee0b7c..8cb4b1ed9 100644
--- a/lib/state/ui/reducer.ts
+++ b/lib/state/ui/reducer.ts
@@ -86,6 +86,20 @@ const editorSelection: A.Reducer<Map<
   }
 };
 
+const alternateLoginEmail: A.Reducer<string | null> = (
+  state = null,
+  action
+) => {
+  switch (action.type) {
+    case 'SHOW_ALTERNATE_LOGIN_PROMPT':
+      return atob(action.email);
+    case 'HIDE_ALTERNATE_LOGIN_PROMPT':
+      return null;
+    default:
+      return state;
+  }
+};
+
 const dialogs: A.Reducer<T.DialogType[]> = (state = [], action) => {
   switch (action.type) {
     case 'CLOSE_DIALOG':
@@ -206,6 +220,21 @@ const openedTag: A.Reducer<T.TagHash | null> = (state = null, action) => {
   }
 };
 
+const showAlternateLoginPrompt: A.Reducer<boolean> = (
+  state = false,
+  action
+) => {
+  switch (action.type) {
+    case 'SHOW_ALTERNATE_LOGIN_PROMPT':
+      return !state;
+
+    case 'HIDE_ALTERNATE_LOGIN_PROMPT':
+      return false;
+    default:
+      return state;
+  }
+};
+
 const showNoteList: A.Reducer<boolean> = (state = true, action) => {
   switch (action.type) {
     case 'NOTE_LIST_TOGGLE':
@@ -324,6 +353,7 @@ const tagSuggestions: A.Reducer<T.TagHash[]> = (
 };
 
 export default combineReducers({
+  alternateLoginEmail,
   dialogs,
   editMode,
   editorSelection,
@@ -336,6 +366,7 @@ export default combineReducers({
   openedTag,
   searchQuery,
   selectedSearchMatchIndex,
+  showAlternateLoginPrompt,
   showNavigation,
   showNoteInfo,
   showNoteList,
diff --git a/lib/welcome-message.ts b/lib/welcome-message.ts
deleted file mode 100644
index b6dbdd523..000000000
--- a/lib/welcome-message.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export const content = `Welcome to Simplenote!
- 
-To create a new note, click on the new note button.
- 
-To search your notes, type in the search bar and enter any text. Simplenote will show you matching results instantly.
- 
-Got a really important note? Open the note info bar and press the 'Pin to top' button to pin it to the top of the list.
- 
-Use tags to help organize your notes. Look for the tag bar at the bottom of the note editor.
- 
-Deleted notes go in the trash. You can restore them if you want, or empty the trash to get rid of them forever.
- 
-You can access your notes on the web and your other devices. Go to https://app.simplenote.com to get started.
- 
-We hope you enjoy using Simplenote!`;
diff --git a/scss/_components.scss b/scss/_components.scss
index dd9ae725d..1039c0c3c 100644
--- a/scss/_components.scss
+++ b/scss/_components.scss
@@ -1,3 +1,4 @@
+@import 'alternate-login-prompt/style';
 @import 'app-layout/style';
 @import 'auth/style';
 @import 'components/dev-badge/style';