1 files changed, 6 insertions, 4 deletions

diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx
index a4972dd8d..14f281f7a 100644
--- a/web/react/components/team_signup_with_sso.jsx
+++ b/web/react/components/team_signup_with_sso.jsx
@@ -23,12 +23,14 @@ export default class SSOSignUpPage extends React.Component {
 
         team.display_name = this.state.name;
 
-        if (team.display_name.length <= 3) {
+        if (!team.display_name) {
+            state.nameError = 'Please enter a team name';
+            this.setState(state);
             return;
         }
 
-        if (!team.display_name) {
-            state.nameError = 'Please enter a team name';
+        if (team.display_name.length <= 2) {
+            state.nameError = 'Name must be 3 or more characters up to a maximum of 15';
             this.setState(state);
             return;
         }
@@ -68,7 +70,7 @@ export default class SSOSignUpPage extends React.Component {
         }
 
         var disabled = false;
-        if (this.state.name.length <= 3) {
+        if (this.state.name.length <= 2) {
             disabled = true;
         }