diff --git a/jam-ui/src/components/auth/JKRegistrationForm.js b/jam-ui/src/components/auth/JKRegistrationForm.js
index 5097f77af..03ac4f577 100644
--- a/jam-ui/src/components/auth/JKRegistrationForm.js
+++ b/jam-ui/src/components/auth/JKRegistrationForm.js
@@ -49,7 +49,7 @@ const JKRegistrationForm = ({ hasLabel, jamTrack, jamTrackArtistName }) => {
       toast.success(`${t('signupForm.successMessage')} ${firstName}`);
     } catch (error) {
       console.error(error);
-      toast.error(`${t('signupForm.errorMessage')}`);
+      toast.error(`Registration failed. Please try again.`);
       setIsDisabled(false);
     }
    
@@ -76,14 +76,14 @@ const JKRegistrationForm = ({ hasLabel, jamTrack, jamTrackArtistName }) => {
   }, [currentUser, jamTrack, jamTrackArtistName]);
 
   useEffect(() => {
-    setIsDisabled(!firstName || !email || !password);
-  }, [firstName, email, password]);
+    setIsDisabled(!firstName || !email || !password || (process.env.REACT_APP_RECAPTCHA_ENABLED === 'true' && !capchaToken));
+  }, [firstName, email, password, capchaToken]);
 
-  useEffect(() => {
-    if (process.env.REACT_APP_RECAPTCHA_ENABLED === 'true') {
-      setIsDisabled(!(capchaToken.length > 0));
-    }
-  }, [capchaToken]);
+  // useEffect(() => {
+  //   if (process.env.REACT_APP_RECAPTCHA_ENABLED === 'true') {
+  //     setIsDisabled(!(capchaToken.length > 0));
+  //   }
+  // }, [capchaToken]);
 
   return (
     <Form onSubmit={handleSubmit}>
@@ -127,16 +127,6 @@ const JKRegistrationForm = ({ hasLabel, jamTrack, jamTrackArtistName }) => {
         </InputGroup>
         <div className='mt-2'>{t('signupForm.passwordRequirements')}</div>
       </FormGroup>
-     
-      <div>
-        <p>
-          debug:
-          <br />
-          REACT_APP_RECAPTCHA_ENABLED: {process.env.REACT_APP_RECAPTCHA_ENABLED }
-          <br />
-          capchaToken: {capchaToken}
-        </p>
-      </div>
 
       {process.env.REACT_APP_RECAPTCHA_ENABLED === 'true' && (
         <FormGroup>
diff --git a/jam-ui/src/i18n/locales/en/auth.json b/jam-ui/src/i18n/locales/en/auth.json
index 458db57dd..f192456f6 100644
--- a/jam-ui/src/i18n/locales/en/auth.json
+++ b/jam-ui/src/i18n/locales/en/auth.json
@@ -11,7 +11,7 @@
     "submit": "Sign Up",
     "submitting": "Signing Up...",
     "successMessage": "Successfully registered as",
-    "errorMessage:": "An error occurred. Please try again.",
+    "errorMessage:": "Registration failed. Please try again.",
     "alreadyHaveAccount": "Already have an account?",
     "passwordRequirements": "Your password must be at least 8 characters"
   },