Merge branch 'release-3.4' RC5

2 files changed, 12 insertions, 8 deletions

diff --git a/webapp/components/signup/components/signup_ldap.jsx b/webapp/components/signup/components/signup_ldap.jsx
index 76ad850c0..8c1b1bafb 100644
--- a/webapp/components/signup/components/signup_ldap.jsx
+++ b/webapp/components/signup/components/signup_ldap.jsx
@@ -39,16 +39,12 @@ export default class SignupLdap extends React.Component {
     }
 
     handleLdapIdChange(e) {
-        e.preventDefault();
-
         this.setState({
             ldapId: e.target.value
         });
     }
 
     handleLdapPasswordChange(e) {
-        e.preventDefault();
-
         this.setState({
             ldapPassword: e.target.value
         });
diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx
index 97a3a16d4..d34210760 100644
--- a/webapp/components/signup/signup_controller.jsx
+++ b/webapp/components/signup/signup_controller.jsx
@@ -79,9 +79,16 @@ export default class SignupController extends React.Component {
                             }
                         );
                     },
-                    (err) => {
+                    () => {
                         this.setState({ // eslint-disable-line react/no-did-mount-set-state
-                            serverError: err.message
+                            noOpenServerError: true,
+                            loading: false,
+                            serverError: (
+                                <FormattedMessage
+                                    id='signup_user_completed.invalid_invite'
+                                    defaultMessage='The invite link was invalid.  Please speak with your Administrator to receive an invitation.'
+                                />
+                            )
                         });
                     }
                 );
@@ -281,8 +288,6 @@ export default class SignupController extends React.Component {
             );
         }
 
-        let signupControls = this.renderSignupControls();
-
         let serverError = null;
         if (this.state.serverError) {
             serverError = (
@@ -292,8 +297,11 @@ export default class SignupController extends React.Component {
             );
         }
 
+        let signupControls;
         if (this.state.noOpenServerError || this.state.usedBefore) {
             signupControls = null;
+        } else {
+            signupControls = this.renderSignupControls();
         }
 
         return (