1 files changed, 10 insertions, 6 deletions

diff --git a/webapp/components/team_general_tab.jsx b/webapp/components/team_general_tab.jsx
index 0100cad64..288faae6c 100644
--- a/webapp/components/team_general_tab.jsx
+++ b/webapp/components/team_general_tab.jsx
@@ -106,14 +106,11 @@ class GeneralTab extends React.Component {
         let valid = true;
 
         const name = this.state.name.trim();
-        if (!name) {
+        if (name) {
+            state.clientError = '';
+        } else {
             state.clientError = Utils.localizeMessage('general_tab.required', 'This field is required');
             valid = false;
-        } else if (name === this.props.team.display_name) {
-            state.clientError = Utils.localizeMessage('general_tab.chooseName', 'Please choose a new name for your team');
-            valid = false;
-        } else {
-            state.clientError = '';
         }
 
         this.setState(state);
@@ -278,6 +275,7 @@ class GeneralTab extends React.Component {
                     <div className='radio'>
                         <label>
                             <input
+                                id='teamOpenInvite'
                                 name='userOpenInviteOptions'
                                 type='radio'
                                 defaultChecked={this.state.allow_open_invite}
@@ -293,6 +291,7 @@ class GeneralTab extends React.Component {
                     <div className='radio'>
                         <label>
                             <input
+                                id='teamOpenInviteNo'
                                 name='userOpenInviteOptions'
                                 type='radio'
                                 defaultChecked={!this.state.allow_open_invite}
@@ -352,6 +351,7 @@ class GeneralTab extends React.Component {
                         <label className='col-sm-5 control-label visible-xs-block'/>
                         <div className='col-sm-12'>
                             <input
+                                id='teamInviteId'
                                 className='form-control'
                                 type='text'
                                 onChange={this.updateInviteId}
@@ -360,6 +360,7 @@ class GeneralTab extends React.Component {
                             />
                             <div className='padding-top x2'>
                                 <a
+                                    id='teamInviteIdRegenerate'
                                     href='#'
                                     onClick={this.handleGenerateInviteId}
                                 >
@@ -433,6 +434,7 @@ class GeneralTab extends React.Component {
                     <label className='col-sm-5 control-label'>{teamNameLabel}</label>
                     <div className='col-sm-7'>
                         <input
+                            id='teamName'
                             className='form-control'
                             type='text'
                             maxLength={Constants.MAX_TEAMNAME_LENGTH.toString()}
@@ -491,6 +493,7 @@ class GeneralTab extends React.Component {
                     <label className='col-sm-5 control-label'>{teamDescriptionLabel}</label>
                     <div className='col-sm-7'>
                         <input
+                            id='teamDescription'
                             className='form-control'
                             type='text'
                             maxLength={Constants.MAX_TEAMDESCRIPTION_LENGTH.toString()}
@@ -540,6 +543,7 @@ class GeneralTab extends React.Component {
             <div>
                 <div className='modal-header'>
                     <button
+                        id='closeButton'
                         type='button'
                         className='close'
                         data-dismiss='modal'