diff --git a/frontend/app/components/Client/ManageUsers/ManageUsers.js b/frontend/app/components/Client/ManageUsers/ManageUsers.js
index b0dfd32e9..6d291ed1d 100644
--- a/frontend/app/components/Client/ManageUsers/ManageUsers.js
+++ b/frontend/app/components/Client/ManageUsers/ManageUsers.js
@@ -103,7 +103,7 @@ class ManageUsers extends React.PureComponent {
         </div>
         { !account.smtp &&
           <div className={cn("mb-4 p-2", styles.smtpMessage)}>
-            SMTP is not configured. Please follow <a className="link" href="https://docs.openreplay.com/configuration/configure-smtp" target="_blank">these steps</a> to set it up.
+            SMTP is not configured. Please follow (see <a className="link" href="https://docs.openreplay.com/configuration/configure-smtp" target="_blank">here</a> how to set it up).  You can still add new users, but you’d have to manually copy then send them the invitation link.
           </div>
         }
         <div className={ styles.formGroup }>
diff --git a/frontend/app/components/ForgotPassword/ForgotPassword.js b/frontend/app/components/ForgotPassword/ForgotPassword.js
index 6c4b0d476..d117afd6a 100644
--- a/frontend/app/components/ForgotPassword/ForgotPassword.js
+++ b/frontend/app/components/ForgotPassword/ForgotPassword.js
@@ -22,7 +22,7 @@ const checkDontMatch = (newPassword, newPasswordRepeat) =>
   (state, props) => ({
     errors: state.getIn([ 'user', 'requestResetPassowrd', 'errors' ]),
     resetErrors: state.getIn([ 'user', 'resetPassword', 'errors' ]),
-    loading: state.getIn([ 'user', 'requestResetPassowrd', 'loading' ]),
+    loading: state.getIn([ 'user', 'requestResetPassowrd', 'loading' ]) || state.getIn([ 'user', 'resetPassword', 'loading' ]),
     params: new URLSearchParams(props.location.search)
   }),
   { requestResetPassword, resetPassword },
@@ -111,7 +111,7 @@ export default class ForgotPassword extends React.PureComponent {
         <div className="w-6/12 flex items-center justify-center">
           <form onSubmit={ this.onSubmit }>
             <div className="mb-8">
-              <h2 className="text-center text-3xl mb-6">Reset Password</h2>
+              <h2 className="text-center text-3xl mb-6">{`${resetting ? 'Create' : 'Reset'} Password`}</h2>
             </div>
             <Loader loading={ loading }>
               <div data-hidden={ updated }>
@@ -168,7 +168,7 @@ export default class ForgotPassword extends React.PureComponent {
                         <input
                           autocomplete="new-password"
                           type="password"
-                          placeholder="New Password"
+                          placeholder="Password"
                           name="password"
                           onChange={ this.write }
                           className={ stl.input }
@@ -182,7 +182,7 @@ export default class ForgotPassword extends React.PureComponent {
                         <input
                           autocomplete="new-password"
                           type="password"
-                          placeholder="Repeat New Password"
+                          placeholder="Confirm Password"
                           name="passwordRepeat"
                           onChange={ this.write }
                           className={ stl.input }
@@ -212,9 +212,10 @@ export default class ForgotPassword extends React.PureComponent {
               <Button
                 data-hidden={ updated || requested }
                 type="submit" primary
+                loading={loading}
                 disabled={ (resetting && this.isSubmitDisabled()) || (!resetting && !validEmail)}
               >
-                { 'Reset' }
+                { resetting ? 'Create' : 'Reset' }
               </Button>
 
               <div className={ stl.links }>
diff --git a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx
index 4e39b08e6..0899a8c79 100644
--- a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx
+++ b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx
@@ -12,8 +12,8 @@ interface Props {
 
 export default function SelectorCard({ index = 1, target, showContent } : Props) {
   return (
-    <div className={cn(stl.wrapper, { [stl.active]: showContent })}>
-      <div className={stl.top} onClick={() => activeTarget(index)}>
+    <div className={cn(stl.wrapper, { [stl.active]: showContent })} onClick={() => activeTarget(index)}>
+      <div className={stl.top}>
         <div className={stl.index}>{index + 1}</div>
         <div className="truncate">{target.selector}</div>
       </div>