diff --git a/frontend/app/Router.js b/frontend/app/Router.js
index f66e0fda6..b2024c7d4 100644
--- a/frontend/app/Router.js
+++ b/frontend/app/Router.js
@@ -55,7 +55,6 @@ const ONBOARDING_PATH = routes.onboarding();
   const jwt = state.get('jwt');
   const changePassword = state.getIn([ 'user', 'account', 'changePassword' ]);
   const userInfoLoading = state.getIn([ 'user', 'fetchUserInfoRequest', 'loading' ]);
-  // const fetchingTenants = state.get('user', 'fetchTenantsRequest', 'loading');
   return {
     jwt,
     siteId,
diff --git a/frontend/app/components/Login/Login.js b/frontend/app/components/Login/Login.js
index 81bc8109a..80cc6d12f 100644
--- a/frontend/app/components/Login/Login.js
+++ b/frontend/app/components/Login/Login.js
@@ -15,6 +15,7 @@ const recaptchaRef = React.createRef();
   state => ({
     errors: state.getIn([ 'user', 'loginRequest', 'errors' ]),
     loading: state.getIn([ 'user', 'loginRequest', 'loading' ]),
+    tenants: state.getIn(['user', 'tenants'])
   }),
   { login, },
 )
@@ -44,7 +45,7 @@ export default class Login extends React.Component {
   write = ({ target: { value, name } }) => this.setState({ [ name ]: value })
 
   render() {
-    const { errors, loading } = this.props;
+    const { errors, loading, tenants } = this.props;
     return (
       <div className="flex" style={{ height: '100vh'}}>
         <div className={cn("w-6/12", stl.left)}>
@@ -62,7 +63,7 @@ export default class Login extends React.Component {
             <form onSubmit={ this.onSubmit }>
               <div className="mb-8">
                 <h2 className="text-center text-3xl mb-6">Login to OpenReplay</h2>
-                <div className="text-center text-xl">Don't have an a Account? <span className="link"><Link to={ SIGNUP_ROUTE }>Sign up</Link></span></div>
+                { tenants.length === 0 && <div className="text-center text-xl">Don't have an a Account? <span className="link"><Link to={ SIGNUP_ROUTE }>Sign up</Link></span></div> }
               </div>
               <Loader loading={ loading }>
                 { window.ENV.CAPTCHA_ENABLED && (
diff --git a/frontend/app/components/Signup/Signup.js b/frontend/app/components/Signup/Signup.js
index 0d3862853..7979c5f57 100644
--- a/frontend/app/components/Signup/Signup.js
+++ b/frontend/app/components/Signup/Signup.js
@@ -38,31 +38,6 @@ export default class Signup extends React.Component {
             </div>
           </div>
          </div>
-
-         <div className={cn(stl.bottom, 'absolute bottom-0 w-full py-16 px-20 color-white')}>
-            <div className="text-4xl mb-10">Want to self-host?</div>
-
-            <div className="flex items-start">
-              <div className="mr-4">
-                <Icon name="cloud-fog2-fill" size="26" color="white" />
-              </div>
-              <div className="text-left">
-                <div className="text-xl font-bold">Private Cloud</div>
-                <div className="text-lg">Managed deployments, maximum scalability</div>
-              </div>
-            </div>
-
-            <div className="border-b bg-white my-6 opacity-25" />
-            <div className="flex items-start">
-              <div className="mr-4">
-                <Icon name="integrations/github" size="26" color="white" />
-              </div>
-              <div className="text-left">
-                <div className="text-xl font-bold">Open source</div>
-                <div className="text-lg">Deploy on your own infrastructure. Free forever.</div>
-              </div>
-            </div>
-         </div>
        </div>
        <div className="w-6/12 flex items-center justify-center">
         <div className="">