Merge branch 'master' into PLT-1429

1 files changed, 10 insertions, 0 deletions

diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 47ec58e98..98a832542 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -150,9 +150,18 @@ class SignupUserComplete extends React.Component {
 
         // set up error labels
         var emailError = null;
+        var emailHelpText = (
+            <span className='help-block'>
+                <FormattedMessage
+                    id='signup_user_completed.emailHelp'
+                    defaultMessage='Valid email required for sign-up'
+                />
+            </span>
+        );
         var emailDivStyle = 'form-group';
         if (this.state.emailError) {
             emailError = <label className='control-label'>{this.state.emailError}</label>;
+            emailHelpText = '';
             emailDivStyle += ' has-error';
         }
 
@@ -232,6 +241,7 @@ class SignupUserComplete extends React.Component {
                         spellCheck='false'
                     />
                     {emailError}
+                    {emailHelpText}
                 </div>
             </div>
         );