diff --git a/frontend/app/components/Client/ProfileSettings/ProfileSettings.js b/frontend/app/components/Client/ProfileSettings/ProfileSettings.js
index b1a563979..375e3ba8e 100644
--- a/frontend/app/components/Client/ProfileSettings/ProfileSettings.js
+++ b/frontend/app/components/Client/ProfileSettings/ProfileSettings.js
@@ -52,16 +52,17 @@ export default class ProfileSettings extends React.PureComponent {
           <div><Api /></div>
         </div>
 
-        <div className="border-b my-10" />
-
         { isEnterprise && (
-          <div className="flex items-center">
-            <div className={ styles.left }>
-              <h4 className="text-lg mb-4">{ 'Tenant Key' }</h4>
-              <div className={ styles.info }>{ 'For SSO (SAML) authentication.' }</div>
+          <>
+            <div className="border-b my-10" />
+            <div className="flex items-center">
+              <div className={ styles.left }>
+                <h4 className="text-lg mb-4">{ 'Tenant Key' }</h4>
+                <div className={ styles.info }>{ 'For SSO (SAML) authentication.' }</div>
+              </div>
+              <div><TenantKey /></div>
             </div>
-            <div><TenantKey /></div>
-          </div>
+          </>
         )}
 
         { !isEnterprise && (
diff --git a/frontend/app/components/Client/Users/components/UserList/UserList.tsx b/frontend/app/components/Client/Users/components/UserList/UserList.tsx
index 7b289f7b5..cae5ffd43 100644
--- a/frontend/app/components/Client/Users/components/UserList/UserList.tsx
+++ b/frontend/app/components/Client/Users/components/UserList/UserList.tsx
@@ -66,7 +66,7 @@ function UserList(props: Props) {
                                 editHandler={() => editHandler(user)}
                                 generateInvite={() => userStore.generateInviteCode(user.userId)}
                                 copyInviteCode={() => userStore.copyInviteCode(user.userId)}
-                                // isEnterprise={isEnterprise}
+                                isEnterprise={isEnterprise}
                             />
                         </div>
                     ))}
diff --git a/frontend/app/components/Login/Login.js b/frontend/app/components/Login/Login.js
index b74c52fc7..8719edfc3 100644
--- a/frontend/app/components/Login/Login.js
+++ b/frontend/app/components/Login/Login.js
@@ -80,7 +80,7 @@ export default class Login extends React.Component {
         </div>
         <div className="md:w-6/12 flex items-center justify-center py-10">
           <div className="">
-            <Form onSubmit={ this.onSubmit }>
+            <Form onSubmit={ this.onSubmit } className="flex items-center justify-center flex-col">
               <div className="mb-8">
                 <h2 className="text-center text-3xl mb-6">Login to OpenReplay</h2>
                 { !authDetails.tenants && <div className="text-center text-xl">Don't have an account? <span className="link"><Link to={ SIGNUP_ROUTE }>Sign up</Link></span></div> }
@@ -132,13 +132,13 @@ export default class Login extends React.Component {
                   )) }
                 </div>
               }
-              <div className={ stl.formFooter }>
+              {/* <div className={ stl.formFooter }> */}
                 <Button type="submit" variant="primary" >{ 'Login' }</Button>
 
                 <div className={ cn(stl.links, 'text-lg') }>
                   <Link to={ FORGOT_PASSWORD }>{'Forgot your password?'}</Link>
                 </div>
-              </div>
+              {/* </div> */}
             </Form>
             { authDetails.sso && (
               <div className={cn(stl.sso, "py-2 flex flex-col items-center")}>