10 files changed, 158 insertions, 397 deletions

diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 68d88e218..ef7748343 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -3,14 +3,11 @@ import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import ReactTooltip from 'react-tooltip';
-import { ProBadge, H1, H2 } from '@meetfranz/ui';
-import moment from 'moment';
+import { H1, H2 } from '@meetfranz/ui';
 
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen';
-import { i18nPlanName } from '../../../helpers/plan-helpers';
 import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
@@ -18,30 +15,10 @@ const messages = defineMessages({
     id: 'settings.account.headline',
     defaultMessage: '!!!Account',
   },
-  headlineSubscription: {
-    id: 'settings.account.headlineSubscription',
-    defaultMessage: '!!!Your Subscription',
-  },
   headlineDangerZone: {
     id: 'settings.account.headlineDangerZone',
     defaultMessage: '!!Danger Zone',
   },
-  manageSubscriptionButtonLabel: {
-    id: 'settings.account.manageSubscription.label',
-    defaultMessage: '!!!Manage your subscription',
-  },
-  upgradeAccountToPro: {
-    id: 'settings.account.upgradeToPro.label',
-    defaultMessage: '!!!Upgrade to Franz Professional',
-  },
-  accountTypeBasic: {
-    id: 'settings.account.accountType.basic',
-    defaultMessage: '!!!Basic Account',
-  },
-  accountTypePremium: {
-    id: 'settings.account.accountType.premium',
-    defaultMessage: '!!!Premium Supporter Account',
-  },
   accountEditButton: {
     id: 'settings.account.account.editButton',
     defaultMessage: '!!!Edit Account',
@@ -50,10 +27,6 @@ const messages = defineMessages({
     id: 'settings.account.headlineInvoices',
     defaultMessage: '!!Invoices',
   },
-  invoiceDownload: {
-    id: 'settings.account.invoiceDownload',
-    defaultMessage: '!!!Download',
-  },
   userInfoRequestFailed: {
     id: 'settings.account.userInfoRequestFailed',
     defaultMessage: '!!!Could not load user information',
@@ -76,23 +49,10 @@ const messages = defineMessages({
     defaultMessage:
       '!!!You have received an email with a link to confirm your account deletion. Your account and data cannot be restored!',
   },
-  trial: {
-    id: 'settings.account.trial',
-    defaultMessage: '!!!Free Trial',
-  },
   yourLicense: {
     id: 'settings.account.yourLicense',
     defaultMessage: '!!!Your Franz License:',
   },
-  trialEndsIn: {
-    id: 'settings.account.trialEndsIn',
-    defaultMessage: '!!!Your free trial ends in {duration}.',
-  },
-  trialUpdateBillingInformation: {
-    id: 'settings.account.trialUpdateBillingInfo',
-    defaultMessage:
-      '!!!Please update your billing info to continue using {license} after your trial period.',
-  },
   accountUnavailable: {
     id: 'settings.account.accountUnavailable',
     defaultMessage: 'Account is unavailable',
@@ -107,8 +67,6 @@ const messages = defineMessages({
 class AccountDashboard extends Component {
   static propTypes = {
     user: MobxPropTypes.observableObject.isRequired,
-    isPremiumOverrideUser: PropTypes.bool.isRequired,
-    isProUser: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
     userInfoRequestFailed: PropTypes.bool.isRequired,
     retryUserInfoRequest: PropTypes.func.isRequired,
@@ -116,10 +74,7 @@ class AccountDashboard extends Component {
     isLoadingDeleteAccount: PropTypes.bool.isRequired,
     isDeleteAccountSuccessful: PropTypes.bool.isRequired,
     openEditAccount: PropTypes.func.isRequired,
-    openBilling: PropTypes.func.isRequired,
-    upgradeToPro: PropTypes.func.isRequired,
     openInvoices: PropTypes.func.isRequired,
-    onCloseSubscriptionWindow: PropTypes.func.isRequired,
     server: PropTypes.string.isRequired,
   };
 
@@ -130,8 +85,6 @@ class AccountDashboard extends Component {
   render() {
     const {
       user,
-      isPremiumOverrideUser,
-      isProUser,
       isLoading,
       userInfoRequestFailed,
       retryUserInfoRequest,
@@ -139,20 +92,11 @@ class AccountDashboard extends Component {
       isLoadingDeleteAccount,
       isDeleteAccountSuccessful,
       openEditAccount,
-      openBilling,
-      upgradeToPro,
       openInvoices,
-      onCloseSubscriptionWindow,
       server,
     } = this.props;
     const { intl } = this.context;
 
-    let planName = '';
-
-    if (user.team && user.team.plan) {
-      planName = i18nPlanName(user.team.plan, intl);
-    }
-
     const isUsingWithoutAccount = server === LOCAL_SERVER;
     const isUsingFranzServer = server === LIVE_FRANZ_API;
 
@@ -210,98 +154,40 @@ class AccountDashboard extends Component {
                           <div className="account__info">
                             <H1>
                               <span className="username">{`${user.firstname} ${user.lastname}`}</span>
-                              {user.isPremium && (
-                                <>
-                                  {' '}
-                                  <ProBadge />
-                                </>
-                              )}
                             </H1>
                             <p>
                               {user.organization && `${user.organization}, `}
                               {user.email}
                             </p>
-                            {user.isPremium && (
-                              <div className="manage-user-links">
-                                <Button
-                                  label={intl.formatMessage(
-                                    messages.accountEditButton,
-                                  )}
-                                  className="franz-form__button--inverted"
-                                  onClick={openEditAccount}
-                                />
-                              </div>
-                            )}
+                            <div className="manage-user-links">
+                              <Button
+                                label={intl.formatMessage(
+                                  messages.accountEditButton,
+                                )}
+                                className="franz-form__button--inverted"
+                                onClick={openEditAccount}
+                              />
+                            </div>
                           </div>
-                          {!user.isPremium && (
-                            <Button
-                              label={intl.formatMessage(
-                                messages.accountEditButton,
-                              )}
-                              className="franz-form__button--inverted"
-                              onClick={openEditAccount}
-                            />
-                          )}
+                          <Button
+                            label={intl.formatMessage(
+                              messages.accountEditButton,
+                            )}
+                            className="franz-form__button--inverted"
+                            onClick={openEditAccount}
+                          />
                         </div>
                       </div>
-                      {user.isPremium && user.isSubscriptionOwner && isUsingFranzServer && (
+                      {user.isSubscriptionOwner && isUsingFranzServer && (
                         <div className="account">
                           <div className="account__box">
                             <H2>{intl.formatMessage(messages.yourLicense)}</H2>
                             <p>
                               Franz
-                              {' '}
-                              {isPremiumOverrideUser ? 'Premium' : planName}
-                              {user.team.isTrial && (
-                                <>
-                                  {' – '}
-                                  {intl.formatMessage(messages.trial)}
-                                </>
-                              )}
                             </p>
-                            {user.team.isTrial && (
-                              <>
-                                <br />
-                                <p>
-                                  {intl.formatMessage(messages.trialEndsIn, {
-                                    duration: moment
-                                      .duration(
-                                        moment().diff(user.team.trialEnd),
-                                      )
-                                      .humanize(),
-                                  })}
-                                </p>
-                                <p>
-                                  {intl.formatMessage(
-                                    messages.trialUpdateBillingInformation,
-                                    {
-                                      license: planName,
-                                    },
-                                  )}
-                                </p>
-                              </>
-                            )}
-                            {!isProUser && (
-                              <div className="manage-user-links">
-                                <Button
-                                  label={intl.formatMessage(
-                                    messages.upgradeAccountToPro,
-                                  )}
-                                  className="franz-form__button--primary"
-                                  onClick={upgradeToPro}
-                                />
-                              </div>
-                            )}
                             <div className="manage-user-links">
                               <Button
                                 label={intl.formatMessage(
-                                  messages.manageSubscriptionButtonLabel,
-                                )}
-                                className="franz-form__button--inverted"
-                                onClick={openBilling}
-                              />
-                              <Button
-                                label={intl.formatMessage(
                                   messages.invoicesButton,
                                 )}
                                 className="franz-form__button--inverted"
@@ -311,15 +197,6 @@ class AccountDashboard extends Component {
                           </div>
                         </div>
                       )}
-                      {!user.isPremium && (
-                        <div className="account franz-form">
-                          <div className="account__box">
-                            <SubscriptionForm
-                              onCloseWindow={onCloseSubscriptionWindow}
-                            />
-                          </div>
-                        </div>
-                      )}
                     </>
                   )}
 
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index cebab2f12..02cae6b69 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
 import { inject, observer } from 'mobx-react';
-import { ProBadge } from '@meetfranz/ui';
 import { RouterStore } from 'mobx-react-router';
 
 import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config';
@@ -11,7 +10,6 @@ import { workspaceStore } from '../../../features/workspaces';
 import UIStore from '../../../stores/UIStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import UserStore from '../../../stores/UserStore';
-import { serviceLimitStore } from '../../../features/serviceLimit';
 
 const messages = defineMessages({
   availableServices: {
@@ -98,8 +96,6 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
 
   render() {
     const { serviceCount, workspaceCount, stores } = this.props;
-    const { isDarkThemeActive } = stores.ui;
-    const { router, user } = stores;
     const { intl } = this.context;
     const isLoggedIn = Boolean(localStorage.getItem('authToken'));
     const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER;
@@ -124,9 +120,6 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           {' '}
           <span className="badge">
             {serviceCount}
-            {serviceLimitStore.serviceLimit !== 0 && (
-              `/${serviceLimitStore.serviceLimit}`
-            )}
           </span>
         </Link>
         {workspaceStore.isFeatureEnabled ? (
@@ -138,11 +131,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
           >
             {intl.formatMessage(messages.yourWorkspaces)}
             {' '}
-            {workspaceStore.isPremiumUpgradeRequired ? (
-              <ProBadge inverted={!isDarkThemeActive && workspaceStore.isSettingsRouteActive} />
-            ) : (
-              <span className="badge">{workspaceCount}</span>
-            )}
+            <span className="badge">{workspaceCount}</span>
           </Link>
         ) : null}
         {!isUsingWithoutAccount && (
@@ -163,9 +152,6 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e
             disabled={!isLoggedIn}
           >
             {intl.formatMessage(messages.team)}
-            {!user.data.isPremium && (
-              <ProBadge inverted={!isDarkThemeActive && router.location.pathname === '/settings/team'} />
-            )}
           </Link>
         )}
         <Link
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js
index 12e3775f6..55f415bd5 100644
--- a/src/components/settings/recipes/RecipeItem.js
+++ b/src/components/settings/recipes/RecipeItem.js
@@ -28,6 +28,11 @@ export default @observer class RecipeItem extends Component {
           alt=""
         />
         <span className="recipe-teaser__label">{recipe.name}</span>
+        {recipe.aliases && recipe.aliases.length > 0 && (
+          <span className="recipe-teaser__alias_label">
+            {`Aliases: ${recipe.aliases.join(', ')}`}
+          </span>
+        )}
       </button>
     );
   }
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index b4e2fc05c..44ff2d0d7 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -6,15 +6,13 @@ import { Link } from 'react-router';
 
 import { Button, Input } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
-import { H3, H2, ProBadge } from '@meetfranz/ui';
+import { H3, H2 } from '@meetfranz/ui';
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
 import RecipeItem from './RecipeItem';
 import Loader from '../../ui/Loader';
 import Appear from '../../ui/effects/Appear';
 import { FRANZ_SERVICE_REQUEST } from '../../../config';
-import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
-import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import RecipePreview from '../../../models/RecipePreview';
 
 const messages = defineMessages({
@@ -26,10 +24,6 @@ const messages = defineMessages({
     id: 'settings.searchService',
     defaultMessage: '!!!Search service',
   },
-  mostPopularRecipes: {
-    id: 'settings.recipes.mostPopular',
-    defaultMessage: '!!!Most popular',
-  },
   allRecipes: {
     id: 'settings.recipes.all',
     defaultMessage: '!!!All services',
@@ -109,7 +103,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
     recipes: MobxPropTypes.arrayOrObservableArray.isRequired,
     customWebsiteRecipe: PropTypes.instanceOf(RecipePreview).isRequired,
     isLoading: PropTypes.bool.isRequired,
-    hasLoadedRecipes: PropTypes.bool.isRequired,
     showAddServiceInterface: PropTypes.func.isRequired,
     searchRecipes: PropTypes.func.isRequired,
     resetSearch: PropTypes.func.isRequired,
@@ -120,7 +113,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
     openRecipeDirectory: PropTypes.func.isRequired,
     openDevDocs: PropTypes.func.isRequired,
     classes: PropTypes.object.isRequired,
-    isCommunityRecipesIncludedInCurrentPlan: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -137,7 +129,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
       recipes,
       customWebsiteRecipe,
       isLoading,
-      hasLoadedRecipes,
       showAddServiceInterface,
       searchRecipes,
       resetSearch,
@@ -148,11 +139,9 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
       openRecipeDirectory,
       openDevDocs,
       classes,
-      isCommunityRecipesIncludedInCurrentPlan,
     } = this.props;
     const { intl } = this.context;
 
-
     const communityRecipes = recipes.filter(r => !r.isDevRecipe);
     const devRecipes = recipes.filter(r => r.isDevRecipe);
 
@@ -163,7 +152,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
         <div className="settings__header">
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
-        <LimitReachedInfobox />
         <div className="settings__body recipes">
           {serviceStatus.length > 0 && serviceStatus.includes('created') && (
             <Appear>
@@ -190,14 +178,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
               activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
               onClick={() => resetSearch()}
             >
-              {intl.formatMessage(messages.mostPopularRecipes)}
-            </Link>
-            <Link
-              to="/settings/recipes/all"
-              className="badge"
-              activeClassName={`${!searchNeedle ? 'badge--primary' : ''}`}
-              onClick={() => resetSearch()}
-            >
               {intl.formatMessage(messages.allRecipes)}
             </Link>
             <Link
@@ -208,7 +188,7 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
             >
               {intl.formatMessage(messages.customRecipes)}
             </Link>
-            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request">
+            <a href={FRANZ_SERVICE_REQUEST} target="_blank" className="link recipes__service-request" rel="noreferrer">
               {intl.formatMessage(messages.missingService)}
               {' '}
               <i className="mdi mdi-open-in-new" />
@@ -223,9 +203,6 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                 <>
                   <H2>
                     {intl.formatMessage(messages.headlineCustomRecipes)}
-                    {!isCommunityRecipesIncludedInCurrentPlan && (
-                      <ProBadge className={classes.proBadge} />
-                    )}
                   </H2>
                   <div className={classes.devRecipeIntroContainer}>
                     <p>
@@ -251,37 +228,33 @@ export default @injectSheet(styles) @observer class RecipesDashboard extends Com
                   </div>
                 </>
               )}
-              <PremiumFeatureContainer
-                condition={(recipeFilter === 'dev' && communityRecipes.length > 0) && !isCommunityRecipesIncludedInCurrentPlan}
-              >
-                {recipeFilter === 'dev' && communityRecipes.length > 0 && (
-                  <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3>
-                )}
-                <div className="recipes__list">
-                  {hasLoadedRecipes && recipes.length === 0 && recipeFilter !== 'dev' && (
-                    <div className="align-middle settings__empty-state">
-                      <span className="emoji">
-                        <img src="./assets/images/emoji/dontknow.png" alt="" />
-                      </span>
+              {recipeFilter === 'dev' && communityRecipes.length > 0 && (
+                <H3>{intl.formatMessage(messages.headlineCommunityRecipes)}</H3>
+              )}
+              <div className="recipes__list">
+                {recipes.length === 0 && recipeFilter !== 'dev' && (
+                  <div className="align-middle settings__empty-state">
+                    <span className="emoji">
+                      <img src="./assets/images/emoji/dontknow.png" alt="" />
+                    </span>
 
-                      <p className="settings__empty-state-text">{intl.formatMessage(messages.nothingFound)}</p>
+                    <p className="settings__empty-state-text">{intl.formatMessage(messages.nothingFound)}</p>
 
-                      <RecipeItem
-                        key={customWebsiteRecipe.id}
-                        recipe={customWebsiteRecipe}
-                        onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: customWebsiteRecipe.id })}
-                      />
-                    </div>
-                  )}
-                  {communityRecipes.map(recipe => (
                     <RecipeItem
-                      key={recipe.id}
-                      recipe={recipe}
-                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                      key={customWebsiteRecipe.id}
+                      recipe={customWebsiteRecipe}
+                      onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: customWebsiteRecipe.id })}
                     />
-                  ))}
-                </div>
-              </PremiumFeatureContainer>
+                  </div>
+                )}
+                {communityRecipes.map(recipe => (
+                  <RecipeItem
+                    key={recipe.id}
+                    recipe={recipe}
+                    onClick={() => isLoggedIn && showAddServiceInterface({ recipeId: recipe.id })}
+                  />
+                ))}
+              </div>
               {recipeFilter === 'dev' && devRecipes.length > 0 && (
                 <div className={classes.devRecipeList}>
                   <H3>{intl.formatMessage(messages.headlineDevRecipes)}</H3>
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 513c75eed..c41cdd56a 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -1,4 +1,4 @@
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { Link } from 'react-router';
@@ -6,7 +6,6 @@ import { defineMessages, intlShape } from 'react-intl';
 import normalizeUrl from 'normalize-url';
 
 import Form from '../../../lib/Form';
-import User from '../../../models/User';
 import Recipe from '../../../models/Recipe';
 import Service from '../../../models/Service';
 import Tabs, { TabItem } from '../../ui/Tabs';
@@ -17,9 +16,6 @@ import Button from '../../ui/Button';
 import ImageUpload from '../../ui/ImageUpload';
 import Select from '../../ui/Select';
 
-import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
-import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
-import { serviceLimitStore } from '../../../features/serviceLimit';
 import { isMac } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
 
@@ -80,14 +76,6 @@ const messages = defineMessages({
     id: 'settings.service.form.customUrlValidationError',
     defaultMessage: '!!!Could not validate custom {name} server.',
   },
-  customUrlPremiumInfo: {
-    id: 'settings.service.form.customUrlPremiumInfo',
-    defaultMessage: '!!!To add self hosted services, you need a Ferdi Premium Supporter Account.',
-  },
-  customUrlUpgradeAccount: {
-    id: 'settings.service.form.customUrlUpgradeAccount',
-    defaultMessage: '!!!Upgrade your account',
-  },
   indirectMessageInfo: {
     id: 'settings.service.form.indirectMessageInfo',
     defaultMessage: '!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...',
@@ -149,7 +137,6 @@ export default @observer class EditServiceForm extends Component {
 
       return null;
     },
-    user: PropTypes.instanceOf(User).isRequired,
     action: PropTypes.string.isRequired,
     form: PropTypes.instanceOf(Form).isRequired,
     onSubmit: PropTypes.func.isRequired,
@@ -158,9 +145,6 @@ export default @observer class EditServiceForm extends Component {
     isSaving: PropTypes.bool.isRequired,
     isDeleting: PropTypes.bool.isRequired,
     isProxyFeatureEnabled: PropTypes.bool.isRequired,
-    isServiceProxyIncludedInCurrentPlan: PropTypes.bool.isRequired,
-    isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
-    isHibernationFeatureActive: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -217,16 +201,12 @@ export default @observer class EditServiceForm extends Component {
       recipe,
       service,
       action,
-      user,
       form,
       isSaving,
       isDeleting,
       onDelete,
       openRecipeFile,
       isProxyFeatureEnabled,
-      isServiceProxyIncludedInCurrentPlan,
-      isSpellcheckerIncludedInCurrentPlan,
-      isHibernationFeatureActive,
     } = this.props;
     const { intl } = this.context;
 
@@ -285,9 +265,8 @@ export default @observer class EditServiceForm extends Component {
             )}
           </span>
         </div>
-        <LimitReachedInfobox />
         <div className="settings__body">
-          <form onSubmit={e => this.submit(e)} id="form">
+          <form onSubmit={(e) => this.submit(e)} id="form">
             <div className="service-name">
               <Input field={form.$('name')} focus />
             </div>
@@ -311,24 +290,11 @@ export default @observer class EditServiceForm extends Component {
                 )}
                 {recipe.hasCustomUrl && (
                   <TabItem title={intl.formatMessage(messages.tabOnPremise)}>
-                    {user.isPremium || recipe.author.find(a => a.email === user.email) ? (
-                      <>
-                        <Input field={form.$('customUrl')} />
-                        {form.error === 'url-validation-error' && (
-                          <p className="franz-form__error">
-                            {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
-                          </p>
-                        )}
-                      </>
-                    ) : (
-                      <div className="center premium-info">
-                        <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p>
-                        <p>
-                          <Link to="/settings/user" className="button">
-                            {intl.formatMessage(messages.customUrlUpgradeAccount)}
-                          </Link>
-                        </p>
-                      </div>
+                    <Input field={form.$('customUrl')} />
+                    {form.error === 'url-validation-error' && (
+                      <p className="franz-form__error">
+                        {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })}
+                      </p>
                     )}
                   </TabItem>
                 )}
@@ -373,14 +339,10 @@ export default @observer class EditServiceForm extends Component {
                 <div className="settings__settings-group">
                   <h3>{intl.formatMessage(messages.headlineGeneral)}</h3>
                   <Toggle field={form.$('isEnabled')} />
-                  {isHibernationFeatureActive && (
-                    <>
-                      <Toggle field={form.$('isHibernationEnabled')} />
-                      <p className="settings__help indented__help">
-                        {intl.formatMessage(messages.isHibernationEnabledInfo)}
-                      </p>
-                    </>
-                  )}
+                  <Toggle field={form.$('isHibernationEnabled')} />
+                  <p className="settings__help indented__help">
+                    {intl.formatMessage(messages.isHibernationEnabledInfo)}
+                  </p>
                   <Toggle field={form.$('isDarkModeEnabled')} />
                   {form.$('isDarkModeEnabled').value
                     && (
@@ -403,56 +365,46 @@ export default @observer class EditServiceForm extends Component {
             </div>
 
             {!isMac && (
-              <PremiumFeatureContainer
-                condition={!isSpellcheckerIncludedInCurrentPlan}
-                gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
-              >
-                <div className="settings__settings-group">
-                  <Select field={form.$('spellcheckerLanguage')} />
-                </div>
-              </PremiumFeatureContainer>
+              <div className="settings__settings-group">
+                <Select field={form.$('spellcheckerLanguage')} />
+              </div>
             )}
 
             {isProxyFeatureEnabled && (
-              <PremiumFeatureContainer
-                condition={!isServiceProxyIncludedInCurrentPlan}
-                gaEventInfo={{ category: 'User', event: 'upgrade', label: 'proxy' }}
-              >
-                <div className="settings__settings-group">
-                  <h3>
-                    {intl.formatMessage(messages.headlineProxy)}
-                    <span className="badge badge--success">beta</span>
-                  </h3>
-                  <Toggle field={form.$('proxy.isEnabled')} />
-                  {form.$('proxy.isEnabled').value && (
-                    <>
-                      <div className="grid">
-                        <div className="grid__row">
-                          <Input field={form.$('proxy.host')} className="proxyHost" />
-                          <Input field={form.$('proxy.port')} />
-                        </div>
+              <div className="settings__settings-group">
+                <h3>
+                  {intl.formatMessage(messages.headlineProxy)}
+                  <span className="badge badge--success">beta</span>
+                </h3>
+                <Toggle field={form.$('proxy.isEnabled')} />
+                {form.$('proxy.isEnabled').value && (
+                  <>
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Input field={form.$('proxy.host')} className="proxyHost" />
+                        <Input field={form.$('proxy.port')} />
                       </div>
-                      <div className="grid">
-                        <div className="grid__row">
-                          <Input field={form.$('proxy.user')} />
-                          <Input
-                            field={form.$('proxy.password')}
-                            showPasswordToggle
-                          />
-                        </div>
+                    </div>
+                    <div className="grid">
+                      <div className="grid__row">
+                        <Input field={form.$('proxy.user')} />
+                        <Input
+                          field={form.$('proxy.password')}
+                          showPasswordToggle
+                        />
                       </div>
-                      <p>
-                        <span className="mdi mdi-information" />
-                        {intl.formatMessage(messages.proxyRestartInfo)}
-                      </p>
-                      <p>
-                        <span className="mdi mdi-information" />
-                        {intl.formatMessage(messages.proxyInfo)}
-                      </p>
-                    </>
-                  )}
-                </div>
-              </PremiumFeatureContainer>
+                    </div>
+                    <p>
+                      <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyRestartInfo)}
+                    </p>
+                    <p>
+                      <span className="mdi mdi-information" />
+                      {intl.formatMessage(messages.proxyInfo)}
+                    </p>
+                  </>
+                )}
+              </div>
             )}
 
             <div className="user-agent">
@@ -512,7 +464,7 @@ export default @observer class EditServiceForm extends Component {
               type="submit"
               label={intl.formatMessage(messages.saveService)}
               htmlForm="form"
-              disabled={action !== 'edit' && ((form.isPristine && requiresUserInput) || serviceLimitStore.userHasReachedServiceLimit)}
+              disabled={action !== 'edit' && (form.isPristine && requiresUserInput)}
             />
           )}
         </div>
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js
index a0f05fd20..11d3eaa79 100644
--- a/src/components/settings/services/ServicesDashboard.js
+++ b/src/components/settings/services/ServicesDashboard.js
@@ -10,7 +10,6 @@ import Loader from '../../ui/Loader';
 import FAB from '../../ui/FAB';
 import ServiceItem from './ServiceItem';
 import Appear from '../../ui/effects/Appear';
-import LimitReachedInfobox from '../../../features/serviceLimit/components/LimitReachedInfobox';
 
 const messages = defineMessages({
   headline: {
@@ -93,12 +92,11 @@ export default @observer class ServicesDashboard extends Component {
         <div className="settings__header">
           <h1>{intl.formatMessage(messages.headline)}</h1>
         </div>
-        <LimitReachedInfobox />
         <div className="settings__body">
           {(services.length !== 0 || searchNeedle) && !isLoading && (
             <SearchInput
               placeholder={intl.formatMessage(messages.searchService)}
-              onChange={needle => filterServices({ needle })}
+              onChange={(needle) => filterServices({ needle })}
               onReset={() => resetFilter()}
               autoFocus
             />
@@ -165,7 +163,7 @@ export default @observer class ServicesDashboard extends Component {
           ) : (
             <table className="service-table">
               <tbody>
-                {services.map(service => (
+                {services.map((service) => (
                   <ServiceItem
                     key={service.id}
                     service={service}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 52b26d65b..87a4ada27 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,5 +1,5 @@
 import { app, systemPreferences } from '@electron/remote';
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import prettyBytes from 'pretty-bytes';
@@ -10,14 +10,13 @@ import Button from '../../ui/Button';
 import Toggle from '../../ui/Toggle';
 import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
-import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
 import Input from '../../ui/Input';
 
 import {
   FRANZ_TRANSLATION,
   GITHUB_FRANZ_URL,
 } from '../../../config';
-import { DEFAULT_APP_SETTINGS, isMac, isWindows } from '../../../environment';
+import { DEFAULT_APP_SETTINGS, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
@@ -31,7 +30,7 @@ const messages = defineMessages({
   },
   sentryInfo: {
     id: 'settings.app.sentryInfo',
-    defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.',
+    defaultMessage: '!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data!',
   },
   hibernateInfo: {
     id: 'settings.app.hibernateInfo',
@@ -55,7 +54,7 @@ const messages = defineMessages({
   },
   lockInfo: {
     id: 'settings.app.lockInfo',
-    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.',
+    defaultMessage: '!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.',
   },
   scheduledDNDTimeInfo: {
     id: 'settings.app.scheduledDNDTimeInfo',
@@ -168,12 +167,10 @@ export default @observer class EditSettingsForm extends Component {
     isClearingAllCache: PropTypes.bool.isRequired,
     onClearAllCache: PropTypes.func.isRequired,
     getCacheSize: PropTypes.func.isRequired,
-    isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
     isTodosEnabled: PropTypes.bool.isRequired,
     isTodosActivated: PropTypes.bool.isRequired,
     isWorkspaceEnabled: PropTypes.bool.isRequired,
     automaticUpdates: PropTypes.bool.isRequired,
-    hibernationEnabled: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
     isAdaptableDarkModeEnabled: PropTypes.bool.isRequired,
     isNightlyEnabled: PropTypes.bool.isRequired,
@@ -224,11 +221,9 @@ export default @observer class EditSettingsForm extends Component {
       isClearingAllCache,
       onClearAllCache,
       getCacheSize,
-      isSpellcheckerIncludedInCurrentPlan,
       isTodosEnabled,
       isWorkspaceEnabled,
       automaticUpdates,
-      hibernationEnabled,
       isDarkmodeEnabled,
       isTodosActivated,
       isNightlyEnabled,
@@ -271,8 +266,8 @@ export default @observer class EditSettingsForm extends Component {
         </div>
         <div className="settings__body">
           <form
-            onSubmit={e => this.submit(e)}
-            onChange={e => this.submit(e)}
+            onSubmit={(e) => this.submit(e)}
+            onChange={(e) => this.submit(e)}
             id="form"
           >
             {/* Titles */}
@@ -339,13 +334,8 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Hr />
 
-                <Toggle field={form.$('hibernate')} />
-                {hibernationEnabled && (
-                  <>
-                    <Select field={form.$('hibernationStrategy')} />
-                    <Toggle field={form.$('hibernateOnStartup')} />
-                  </>
-                )}
+                <Select field={form.$('hibernationStrategy')} />
+                <Toggle field={form.$('hibernateOnStartup')} />
                 <p
                   className="settings__message"
                   style={{
@@ -357,14 +347,17 @@ export default @observer class EditSettingsForm extends Component {
                   </span>
                 </p>
 
+                <Select field={form.$('wakeUpStrategy')} />
+
                 <Hr />
 
                 {isWorkspaceEnabled && (
-                  <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                  <>
+                    <Toggle field={form.$('keepAllWorkspacesLoaded')} />
+                    <Hr />
+                  </>
                 )}
 
-                <Hr />
-
                 {isTodosEnabled && !hasAddedTodosAsService && (
                   <>
                     <Toggle field={form.$('enableTodos')} />
@@ -375,7 +368,7 @@ export default @observer class EditSettingsForm extends Component {
                           <div>
                             <Input
                               placeholder="Todo Server"
-                              onChange={e => this.submit(e)}
+                              onChange={(e) => this.submit(e)}
                               field={form.$('customTodoServer')}
                             />
                             <p
@@ -409,7 +402,7 @@ export default @observer class EditSettingsForm extends Component {
                       >
                         <Input
                           placeholder="17:00"
-                          onChange={e => this.submit(e)}
+                          onChange={(e) => this.submit(e)}
                           field={form.$('scheduledDNDStart')}
                           type="time"
                         />
@@ -421,7 +414,7 @@ export default @observer class EditSettingsForm extends Component {
                       >
                         <Input
                           placeholder="09:00"
-                          onChange={e => this.submit(e)}
+                          onChange={(e) => this.submit(e)}
                           field={form.$('scheduledDNDEnd')}
                           type="time"
                         />
@@ -488,7 +481,7 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Input
                   placeholder="Accent Color"
-                  onChange={e => this.submit(e)}
+                  onChange={(e) => this.submit(e)}
                   field={form.$('accentColor')}
                 />
                 <p>
@@ -509,8 +502,12 @@ export default @observer class EditSettingsForm extends Component {
                 <Hr />
 
                 <Select field={form.$('searchEngine')} />
+
+                <Hr />
+
                 <Toggle field={form.$('sentry')} />
-                <p>{intl.formatMessage(messages.sentryInfo)}</p>
+                <p className="settings__help">{intl.formatMessage(messages.sentryInfo)}</p>
+                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
 
                 <Hr />
 
@@ -523,7 +520,7 @@ export default @observer class EditSettingsForm extends Component {
 
                     <Input
                       placeholder={intl.formatMessage(messages.lockedPassword)}
-                      onChange={e => this.submit(e)}
+                      onChange={(e) => this.submit(e)}
                       field={form.$('lockedPassword')}
                       type="password"
                       scorePassword
@@ -535,7 +532,7 @@ export default @observer class EditSettingsForm extends Component {
 
                     <Input
                       placeholder="Lock after inactivity"
-                      onChange={e => this.submit(e)}
+                      onChange={(e) => this.submit(e)}
                       field={form.$('inactivityLock')}
                       autoFocus
                     />
@@ -551,7 +548,7 @@ export default @observer class EditSettingsForm extends Component {
                   }}
                 >
                   <span>
-                    { intl.formatMessage(messages.lockInfo) }
+                    { intl.formatMessage(messages.lockInfo, { lockShortcut: `${lockFerdiShortcutKey(false)}` }) }
                   </span>
                 </p>
               </div>
@@ -564,26 +561,24 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Hr />
 
-                <PremiumFeatureContainer
-                  condition={!isSpellcheckerIncludedInCurrentPlan}
-                  gaEventInfo={{ category: 'User', event: 'upgrade', label: 'spellchecker' }}
-                >
-                  <>
-                    <Toggle
-                      field={form.$('enableSpellchecking')}
-                    />
-                    {!isMac && form.$('enableSpellchecking').value && (
-                      <Select field={form.$('spellcheckerLanguage')} />
-                    )}
-                    {isMac && form.$('enableSpellchecking').value && (
-                      <p>{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
-                    )}
-                  </>
-                </PremiumFeatureContainer>
+                <Toggle
+                  field={form.$('enableSpellchecking')}
+                />
+                {!isMac && form.$('enableSpellchecking').value && (
+                  <Select field={form.$('spellcheckerLanguage')} />
+                )}
+                {isMac && form.$('enableSpellchecking').value && (
+                  <p className="settings__help">{intl.formatMessage(messages.spellCheckerLanguageInfo)}</p>
+                )}
+                <p className="settings__help">{intl.formatMessage(messages.appRestartRequired)}</p>
+
+                <Hr />
+
                 <a
                   href={FRANZ_TRANSLATION}
                   target="_blank"
                   className="link"
+                  rel="noreferrer"
                 >
                   {intl.formatMessage(messages.translationHelp)}
                   {' '}
@@ -602,7 +597,7 @@ export default @observer class EditSettingsForm extends Component {
 
                 <Input
                   placeholder="User Agent"
-                  onChange={e => this.submit(e)}
+                  onChange={(e) => this.submit(e)}
                   field={form.$('userAgentPref')}
                 />
                 <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p>
@@ -688,12 +683,12 @@ export default @observer class EditSettingsForm extends Component {
 
                   Ferdi is based on
                   {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank">Franz</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank" rel="noreferrer">Franz</a>
 
                   , a project published
                   under the
                   {' '}
-                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank">Apache-2.0 License</a>
+                  <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank" rel="noreferrer">Apache-2.0 License</a>
                 </span>
                 <br />
                 <span className="mdi mdi-information" />
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
index 36c126565..b84e06739 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js
@@ -94,10 +94,10 @@ class SupportFerdiDashboard extends Component {
           <h1>{intl.formatMessage(messages.title)}</h1>
           <div>
             <p className="settings__support-badges">
-              <a href="https://github.com/getferdi/ferdi" target="_blank"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a>
-              <a href="https://twitter.com/getferdi/" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a>
-              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a>
+              <a href="https://github.com/getferdi/ferdi" target="_blank" rel="noreferrer"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a>
+              <a href="https://twitter.com/getferdi/" target="_blank" rel="noreferrer"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a>
+              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a>
+              <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a>
             </p>
             <FormattedHTMLMessage {...messages.aboutIntro} />
             <br />
@@ -109,7 +109,7 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textListContributors)}
-              <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link">
+              <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textListContributorsHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -122,7 +122,7 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textSupportWelcome)}
-              <a href="https://help.getferdi.com/general/support" target="_blank" className="link">
+              <a href="https://help.getferdi.com/general/support" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textSupportWelcomeHere)}
                 <i className="mdi mdi-open-in-new" />
@@ -130,7 +130,7 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textExpenses)}
-              <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link">
+              <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
@@ -138,14 +138,14 @@ class SupportFerdiDashboard extends Component {
             </p>
             <p>
               {intl.formatMessage(messages.textDonation)}
-              <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link">
+              <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textOpenCollective)}
                 <i className="mdi mdi-open-in-new" />
               </a>
               {' '}
               {intl.formatMessage(messages.textDonationAnd)}
-              <a href="https://github.com/sponsors/getferdi" target="_blank" className="link">
+              <a href="https://github.com/sponsors/getferdi" target="_blank" className="link" rel="noreferrer">
                 {' '}
                 {intl.formatMessage(messages.textGitHubSponsors)}
                 <i className="mdi mdi-open-in-new" />
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 602d6e490..437225058 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -6,12 +6,9 @@ import ReactTooltip from 'react-tooltip';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
-import { Badge } from '@meetfranz/ui';
 import Loader from '../../ui/Loader';
 import Button from '../../ui/Button';
 import Infobox from '../../ui/Infobox';
-import globalMessages from '../../../i18n/globalMessages';
-import UpgradeButton from '../../ui/UpgradeButton';
 import { LIVE_FRANZ_API } from '../../../config';
 
 const messages = defineMessages({
@@ -35,10 +32,6 @@ const messages = defineMessages({
     id: 'settings.team.manageAction',
     defaultMessage: '!!!Manage your Team on meetfranz.com',
   },
-  upgradeButton: {
-    id: 'settings.team.upgradeAction',
-    defaultMessage: '!!!Upgrade your Account',
-  },
   teamsUnavailable: {
     id: 'settings.team.teamsUnavailable',
     defaultMessage: '!!!Teams are unavailable',
@@ -88,10 +81,6 @@ const styles = {
   headlineWithSpacing: {
     marginBottom: 'inherit',
   },
-  proRequired: {
-    margin: [10, 0, 40],
-    height: 'auto',
-  },
   buttonContainer: {
     display: 'flex',
     height: 'auto',
@@ -105,7 +94,6 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
     retryUserInfoRequest: PropTypes.func.isRequired,
     openTeamManagement: PropTypes.func.isRequired,
     classes: PropTypes.object.isRequired,
-    isProUser: PropTypes.bool.isRequired,
     server: PropTypes.string.isRequired,
   };
 
@@ -119,7 +107,6 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
       userInfoRequestFailed,
       retryUserInfoRequest,
       openTeamManagement,
-      isProUser,
       classes,
       server,
     } = this.props;
@@ -157,37 +144,25 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
                     <>
                       <h1 className={classnames({
                         [classes.headline]: true,
-                        [classes.headlineWithSpacing]: isProUser,
+                        [classes.headlineWithSpacing]: true,
                       })}
                       >
                         {intl.formatMessage(messages.contentHeadline)}
 
                       </h1>
-                      {!isProUser && (
-                        <Badge className={classes.proRequired}>{intl.formatMessage(globalMessages.proRequired)}</Badge>
-                      )}
                       <div className={classes.container}>
                         <div className={classes.content}>
                           <p>{intl.formatMessage(messages.intro)}</p>
                           <p>{intl.formatMessage(messages.copy)}</p>
                         </div>
-                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Franz for Teams" />
+                        <img className={classes.image} src="https://cdn.franzinfra.com/announcements/assets/teams.png" alt="Ferdi for Teams" />
                       </div>
                       <div className={classes.buttonContainer}>
-                        {!isProUser ? (
-                          <UpgradeButton
-                            className={classes.cta}
-                            gaEventInfo={{ category: 'Todos', event: 'upgrade' }}
-                            requiresPro
-                            short
-                          />
-                        ) : (
-                          <Button
-                            label={intl.formatMessage(messages.manageButton)}
-                            onClick={openTeamManagement}
-                            className={classes.cta}
-                          />
-                        )}
+                        <Button
+                          label={intl.formatMessage(messages.manageButton)}
+                          onClick={openTeamManagement}
+                          className={classes.cta}
+                        />
                       </div>
                     </>
                   </>
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index a1a353e57..db78acb69 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -84,7 +84,7 @@ export default @observer class EditUserForm extends Component {
           </span>
         </div>
         <div className="settings__body">
-          <form onSubmit={e => this.submit(e)} id="form">
+          <form onSubmit={(e) => this.submit(e)} id="form">
             {status.length > 0 && status.includes('data-updated') && (
               <Infobox
                 type="success"