diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index ab27e92bf..fe1e48c5b 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -486,7 +486,7 @@ export default class ServerApi {
         return services;
       }
     } catch (err) {
-      throw (new Error('ServerApi::getLegacyServices no config found'));
+      console.warn('ServerApi::getLegacyServices no config found');
     }
 
     return [];
diff --git a/src/app.js b/src/app.js
index fb9f1c6ab..ffb0db79f 100644
--- a/src/app.js
+++ b/src/app.js
@@ -34,7 +34,6 @@ import WelcomeScreen from './containers/auth/WelcomeScreen';
 import LoginScreen from './containers/auth/LoginScreen';
 import PasswordScreen from './containers/auth/PasswordScreen';
 import SignupScreen from './containers/auth/SignupScreen';
-import ImportScreen from './containers/auth/ImportScreen';
 import PricingScreen from './containers/auth/PricingScreen';
 import InviteScreen from './containers/auth/InviteScreen';
 import AuthLayoutContainer from './containers/auth/AuthLayoutContainer';
@@ -90,13 +89,7 @@ window.addEventListener('load', () => {
                 <IndexRedirect to="/auth/welcome" />
                 <Route path="/auth/welcome" component={WelcomeScreen} />
                 <Route path="/auth/login" component={LoginScreen} />
-                <Route path="/auth/signup">
-                  <IndexRedirect to="/auth/signup/form" />
-                  <Route path="/auth/signup/form" component={SignupScreen} />
-                  <Route path="/auth/signup/pricing" component={PricingScreen} />
-                  <Route path="/auth/signup/import" component={ImportScreen} />
-                  <Route path="/auth/signup/invite" component={InviteScreen} />
-                </Route>
+                <Route path="/auth/signup" component={SignupScreen} />
                 <Route path="/auth/password" component={PasswordScreen} />
                 <Route path="/auth/logout" component={LoginScreen} />
               </Route>
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
deleted file mode 100644
index 0d5feb274..000000000
--- a/src/components/auth/Import.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import { Link } from 'react-router';
-import classnames from 'classnames';
-
-import Form from '../../lib/Form';
-import Toggle from '../ui/Toggle';
-import Button from '../ui/Button';
-
-const messages = defineMessages({
-  headline: {
-    id: 'import.headline',
-    defaultMessage: '!!!Import your Franz 4 services',
-  },
-  notSupportedHeadline: {
-    id: 'import.notSupportedHeadline',
-    defaultMessage: '!!!Services not yet supported in Franz 5',
-  },
-  submitButtonLabel: {
-    id: 'import.submit.label',
-    defaultMessage: '!!!Import {count} services',
-  },
-  skipButtonLabel: {
-    id: 'import.skip.label',
-    defaultMessage: '!!!I want to add services manually',
-  },
-});
-
-export default @observer class Import extends Component {
-  static propTypes = {
-    services: MobxPropTypes.arrayOrObservableArray.isRequired,
-    onSubmit: PropTypes.func.isRequired,
-    isSubmitting: PropTypes.bool.isRequired,
-    inviteRoute: PropTypes.string.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  componentWillMount() {
-    const config = {
-      fields: {
-        import: [...this.props.services.filter(s => s.recipe).map(s => ({
-          fields: {
-            add: {
-              default: true,
-              options: s,
-            },
-          },
-        }))],
-      },
-    };
-
-    this.form = new Form(config, this.context.intl);
-  }
-
-  submit(e) {
-    const { services } = this.props;
-    e.preventDefault();
-    this.form.submit({
-      onSuccess: (form) => {
-        const servicesImport = form.values().import
-          .map((value, i) => !value.add || services.filter(s => s.recipe)[i])
-          .filter(s => typeof s !== 'boolean');
-
-        this.props.onSubmit({ services: servicesImport });
-      },
-      onError: () => {},
-    });
-  }
-
-  render() {
-    const { intl } = this.context;
-    const { services, isSubmitting, inviteRoute } = this.props;
-
-    const availableServices = services.filter(s => s.recipe);
-    const unavailableServices = services.filter(s => !s.recipe);
-
-    return (
-      <div className="auth__scroll-container">
-        <div className="auth__container auth__container--signup">
-          <form className="franz-form auth__form" onSubmit={e => this.submit(e)}>
-            <img
-              src="./assets/images/logo.svg"
-              className="auth__logo"
-              alt=""
-            />
-            <h1>
-              {intl.formatMessage(messages.headline)}
-            </h1>
-            <table className="service-table available-services">
-              <tbody>
-                {this.form.$('import').map((service, i) => (
-                  <tr
-                    key={service.id}
-                    className="service-table__row"
-                  >
-                    <td className="service-table__toggle">
-                      <Toggle
-                        field={service.$('add')}
-                        showLabel={false}
-                      />
-                    </td>
-                    <td className="service-table__column-icon">
-                      <img
-                        src={availableServices[i].custom_icon || availableServices[i].recipe.icons.svg}
-                        className={classnames({
-                          'service-table__icon': true,
-                          'has-custom-icon': availableServices[i].custom_icon,
-                        })}
-                        alt=""
-                      />
-                    </td>
-                    <td className="service-table__column-name">
-                      {availableServices[i].name !== ''
-                        ? availableServices[i].name
-                        : availableServices[i].recipe.name}
-                    </td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-            {unavailableServices.length > 0 && (
-              <div className="unavailable-services">
-                <strong>{intl.formatMessage(messages.notSupportedHeadline)}</strong>
-                <p>
-                  {services.filter(s => !s.recipe).map((service, i) => (
-                    <span key={service.id}>
-                      {service.name !== '' ? service.name : service.service}
-                      {unavailableServices.length > i + 1 ? ', ' : ''}
-                    </span>
-                  ))}
-                </p>
-              </div>
-            )}
-
-            {isSubmitting ? (
-              <Button
-                className="auth__button is-loading"
-                label={`${intl.formatMessage(messages.submitButtonLabel)} ...`}
-                loaded={false}
-                disabled
-              />
-            ) : (
-              <Button
-                type="submit"
-                className="auth__button"
-                label={intl.formatMessage(messages.submitButtonLabel)}
-              />
-            )}
-            <Link
-              to={inviteRoute}
-              className="franz-form__button franz-form__button--secondary auth__button auth__button--skip"
-            >
-              {intl.formatMessage(messages.skipButtonLabel)}
-            </Link>
-          </form>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js
deleted file mode 100644
index 7ab14f429..000000000
--- a/src/components/auth/Pricing.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-// import { Link } from 'react-router';
-
-// import Button from '../ui/Button';
-import Loader from '../ui/Loader';
-import Appear from '../ui/effects/Appear';
-import SubscriptionForm from '../../containers/subscription/SubscriptionFormScreen';
-
-const messages = defineMessages({
-  headline: {
-    id: 'pricing.headline',
-    defaultMessage: '!!!Support Franz',
-  },
-  monthlySupportLabel: {
-    id: 'pricing.support.label',
-    defaultMessage: '!!!Select your support plan',
-  },
-  submitButtonLabel: {
-    id: 'pricing.submit.label',
-    defaultMessage: '!!!Support the development of Franz',
-  },
-  skipPayment: {
-    id: 'pricing.link.skipPayment',
-    defaultMessage: '!!!I don\'t want to support the development of Franz.',
-  },
-});
-
-export default @observer class Signup extends Component {
-  static propTypes = {
-    donor: MobxPropTypes.objectOrObservableObject.isRequired,
-    isLoading: PropTypes.bool.isRequired,
-    isLoadingUser: PropTypes.bool.isRequired,
-    onCloseSubscriptionWindow: PropTypes.func.isRequired,
-    skipAction: PropTypes.func.isRequired,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      donor,
-      isLoading,
-      isLoadingUser,
-      onCloseSubscriptionWindow,
-      skipAction,
-    } = this.props;
-    const { intl } = this.context;
-
-    return (
-      <div className="auth__scroll-container">
-        <div className="auth__container auth__container--signup">
-          <form className="franz-form auth__form">
-            <img
-              src="./assets/images/sm.png"
-              className="auth__logo auth__logo--sm"
-              alt=""
-            />
-            <h1>{intl.formatMessage(messages.headline)}</h1>
-            <div className="auth__letter">
-              {isLoadingUser && (
-                <p>Loading</p>
-              )}
-              {!isLoadingUser && (
-                donor.amount ? (
-                  <span>
-                    <p>
-                      Thank you so much for your previous donation of
-                      {' '}
-                      <strong>
-                        $
-                        {donor.amount}
-                      </strong>
-                      .
-                      <br />
-                      Your support allowed us to get where we are today.
-                      <br />
-                    </p>
-                    <p>
-                      As an early supporter, you get
-                      {' '}
-                      <strong>a lifetime premium supporter license</strong>
-                      {' '}
-                      without any
-                      additional charges.
-                    </p>
-                    <p>
-                      However, If you want to keep supporting us, you are more than welcome to subscribe to a plan.
-                      <br />
-                      <br />
-                    </p>
-                  </span>
-                ) : (
-                  <span>
-                    <p>
-                      We built Franz with a lot of effort, manpower and love,
-                      to bring you the best messaging experience.
-                      <br />
-                    </p>
-                    <p>
-                      Getting a Franz Premium Supporter License will allow us to keep improving Franz for you.
-                    </p>
-                  </span>
-                )
-              )}
-              <p>
-                Thanks for being a hero.
-              </p>
-              <p>
-                <strong>Stefan Malzner</strong>
-              </p>
-            </div>
-            <Loader loaded={!isLoading}>
-              <Appear transitionName="slideDown">
-                <span className="label">{intl.formatMessage(messages.monthlySupportLabel)}</span>
-                <SubscriptionForm
-                  onCloseWindow={onCloseSubscriptionWindow}
-                  showSkipOption
-                  skipAction={skipAction}
-                  hideInfo={Boolean(donor.amount)}
-                  skipButtonLabel={intl.formatMessage(messages.skipPayment)}
-                />
-              </Appear>
-            </Loader>
-          </form>
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js
deleted file mode 100644
index 4a93891d6..000000000
--- a/src/containers/auth/ImportScreen.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import Import from '../../components/auth/Import';
-import UserStore from '../../stores/UserStore';
-
-export default @inject('stores', 'actions') @observer class ImportScreen extends Component {
-  render() {
-    const { actions, stores } = this.props;
-
-    if (stores.user.isImportLegacyServicesCompleted) {
-      stores.router.push(stores.user.inviteRoute);
-    }
-
-    return (
-      <Import
-        services={stores.user.legacyServices}
-        onSubmit={actions.user.importLegacyServices}
-        isSubmitting={stores.user.isImportLegacyServicesExecuting}
-        inviteRoute={stores.user.inviteRoute}
-      />
-    );
-  }
-}
-
-ImportScreen.wrappedComponent.propTypes = {
-  actions: PropTypes.shape({
-    user: PropTypes.shape({
-      importLegacyServices: PropTypes.func.isRequired,
-    }).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js
deleted file mode 100644
index 8d179a170..000000000
--- a/src/containers/auth/PricingScreen.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { RouterStore } from 'mobx-react-router';
-
-import Pricing from '../../components/auth/Pricing';
-import UserStore from '../../stores/UserStore';
-import PaymentStore from '../../stores/PaymentStore';
-
-import { globalError as globalErrorPropType } from '../../prop-types';
-
-export default @inject('stores', 'actions') @observer class PricingScreen extends Component {
-  static propTypes = {
-    error: globalErrorPropType.isRequired,
-  };
-
-  render() {
-    const { actions, stores, error } = this.props;
-
-    const nextStepRoute = stores.user.legacyServices.length ? stores.user.importRoute : stores.user.inviteRoute;
-
-    return (
-      <Pricing
-        donor={stores.user.data.donor || {}}
-        onSubmit={actions.user.signup}
-        onCloseSubscriptionWindow={() => this.props.stores.router.push(nextStepRoute)}
-        isLoading={stores.payment.plansRequest.isExecuting}
-        isLoadingUser={stores.user.getUserInfoRequest.isExecuting}
-        error={error}
-        skipAction={() => this.props.stores.router.push(nextStepRoute)}
-      />
-    );
-  }
-}
-
-PricingScreen.wrappedComponent.propTypes = {
-  actions: PropTypes.shape({
-    user: PropTypes.shape({
-      signup: PropTypes.func.isRequired,
-    }).isRequired,
-  }).isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    payment: PropTypes.instanceOf(PaymentStore).isRequired,
-    router: PropTypes.instanceOf(RouterStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 31555dd5c..80a45c9c4 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -23,12 +23,8 @@ export default class UserStore extends Store {
 
   SIGNUP_ROUTE = `${this.BASE_ROUTE}/signup`;
 
-  PRICING_ROUTE = `${this.BASE_ROUTE}/signup/pricing`;
-
   IMPORT_ROUTE = `${this.BASE_ROUTE}/signup/import`;
 
-  INVITE_ROUTE = `${this.BASE_ROUTE}/signup/invite`;
-
   PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`;
 
   @observable loginRequest = new Request(this.api.user, 'login');
@@ -108,14 +104,6 @@ export default class UserStore extends Store {
     return this.SIGNUP_ROUTE;
   }
 
-  get pricingRoute() {
-    return this.PRICING_ROUTE;
-  }
-
-  get inviteRoute() {
-    return this.INVITE_ROUTE;
-  }
-
   get importRoute() {
     return this.IMPORT_ROUTE;
   }
@@ -181,11 +169,11 @@ export default class UserStore extends Store {
       locale: this.stores.app.locale,
     });
 
-    this.hasCompletedSignup = false;
+    this.hasCompletedSignup = true;
 
     this._setUserData(authToken);
 
-    this.stores.router.push(this.PRICING_ROUTE);
+    this.stores.router.push('/settings/recipes');
 
     gaEvent('User', 'signup');
   }
@@ -206,11 +194,6 @@ export default class UserStore extends Store {
 
     this.actionStatus = response.status || [];
 
-    // we do not wait for a server response before redirecting the user ONLY DURING SIGNUP
-    if (this.stores.router.location.pathname.includes(this.INVITE_ROUTE)) {
-      this.stores.router.push('/');
-    }
-
     gaEvent('User', 'inviteUsers');
   }