1 files changed, 15 insertions, 8 deletions

diff --git a/web/react/components/team_signup_with_email.jsx b/web/react/components/team_signup_with_email.jsx
index 021713f04..4150a0013 100644
--- a/web/react/components/team_signup_with_email.jsx
+++ b/web/react/components/team_signup_with_email.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
 
 export default class EmailSignUpPage extends React.Component {
     constructor() {
@@ -14,18 +14,19 @@ export default class EmailSignUpPage extends React.Component {
     }
     handleSubmit(e) {
         e.preventDefault();
-        var team = {};
-        var state = {serverError: ''};
+        const team = {};
+        const state = {serverError: null};
+        let isValid = true;
 
         team.email = ReactDOM.findDOMNode(this.refs.email).value.trim().toLowerCase();
         if (!team.email || !Utils.isEmail(team.email)) {
             state.emailError = 'Please enter a valid email address';
-            state.inValid = true;
+            isValid = false;
         } else {
-            state.emailError = '';
+            state.emailError = null;
         }
 
-        if (state.inValid) {
+        if (!isValid) {
             this.setState(state);
             return;
         }
@@ -45,11 +46,16 @@ export default class EmailSignUpPage extends React.Component {
         );
     }
     render() {
-        var serverError = null;
+        let serverError = null;
         if (this.state.serverError) {
             serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
         }
 
+        let emailError = null;
+        if (this.state.emailError) {
+            emailError = <div className='form-group has-error'><label className='control-label'>{this.state.emailError}</label></div>;
+        }
+
         return (
             <form
                 role='form'
@@ -65,6 +71,7 @@ export default class EmailSignUpPage extends React.Component {
                         maxLength='128'
                         spellCheck='false'
                     />
+                    {emailError}
                 </div>
                 <div className='form-group'>
                     <button