diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index a296345b1e..b21553d8a5 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -166,6 +166,11 @@ module.exports = React.createClass({
            );
         }
 
+        var termsDisclaimer = null;
+        if (config.ShowTermsDuringSignup) {
+            termsDisclaimer = <p>By creating an account and using Mattermost you are agreeing to our <a href={config.TermsLink}>Terms of Service</a>. If you do not agree, you cannot use this service.</p>;
+        }
+
         return (
             <div>
                 <form>
@@ -196,7 +201,7 @@ module.exports = React.createClass({
                     </div>
                     <p className='margin--extra'><button type='submit' onClick={this.handleSubmit} className='btn-primary btn'>Create Account</button></p>
                     {serverError}
-                    <p>By creating an account and using Mattermost you are agreeing to our <a href={ config.TermsLink }>Terms of Service</a>. If you do not agree, you cannot use this service.</p>
+                    {termsDisclaimer}
                 </form>
             </div>
         );
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 0d564b77ed..00cae7ab2c 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -31,6 +31,9 @@ var config = {
     ReportProblemLink: "/static/help/configure_links.html",
     HomeLink: "",
 
+    // Toggle whether or not users are shown a message about agreeing to the Terms of Service during the signup process
+    ShowTermsDuringSignup: false,
+
     ThemeColors: ["#2389d7", "#008a17", "#dc4fad", "#ac193d", "#0072c6", "#d24726", "#ff8f32", "#82ba00", "#03b3b2", "#008299", "#4617b4", "#8c0095", "#004b8b", "#004b8b", "#570000", "#380000", "#585858", "#000000"]
 };