1 files changed, 22 insertions, 24 deletions

diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx
index af35c5d8d..d702b8cdf 100644
--- a/webapp/components/signup/signup_controller.jsx
+++ b/webapp/components/signup/signup_controller.jsx
@@ -83,18 +83,7 @@ export default class SignupController extends React.Component {
                             }
                         );
                     },
-                    () => {
-                        this.setState({ // eslint-disable-line react/no-did-mount-set-state
-                            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.'
-                                />
-                            )
-                        });
-                    }
+                    this.handleInvalidInvite
                 );
 
                 return;
@@ -113,18 +102,7 @@ export default class SignupController extends React.Component {
                             loading: false
                         });
                     },
-                    () => {
-                        this.setState({ // eslint-disable-line react/no-did-mount-set-state
-                            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.'
-                                />
-                            )
-                        });
-                    }
+                    this.handleInvalidInvite
                 );
 
                 return;
@@ -136,6 +114,26 @@ export default class SignupController extends React.Component {
         }
     }
 
+    handleInvalidInvite = (err) => {
+        let serverError;
+        if (err.id === 'store.sql_user.save.max_accounts.app_error') {
+            serverError = err.message;
+        } else {
+            serverError = (
+                <FormattedMessage
+                    id='signup_user_completed.invalid_invite'
+                    defaultMessage='The invite link was invalid.  Please speak with your Administrator to receive an invitation.'
+                />
+            );
+        }
+
+        this.setState({
+            noOpenServerError: true,
+            loading: false,
+            serverError
+        });
+    }
+
     renderSignupControls() {
         let signupControls = [];