diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx
index a43e5d2f0c..166b1f38b6 100644
--- a/web/react/components/team_settings.jsx
+++ b/web/react/components/team_settings.jsx
@@ -78,13 +78,14 @@ var FeatureTab = React.createClass({
                         <button className={"btn btn-default "+valetActive[0]} onClick={function(){self.handleValetRadio("true")}}>On</button>
                         <button className={"btn btn-default "+valetActive[1]} onClick={function(){self.handleValetRadio("false")}}>Off</button>
                     </div>
-                    <div><br/>Warning: Turning on the Valet feature and using it with any third party software increases the risk of a security breach.</div>
+                    <div><br/>Valet is a preview feature for enabling a non-user account limited to basic member permissions that can be manipulated by 3rd parties.<br/><br/>IMPORTANT: The preview version of Valet should not be used without a secure connection and a trusted 3rd party, since user credentials are used to connect. OAuth2 will be used in the final release.</div>
+                    <br></br>
                 </div>
             );
 
             valetSection = (
                 <SettingItemMax
-                    title="Valet"
+                    title="Valet (Preview - EXPERTS ONLY)"
                     inputs={inputs}
                     submit={this.submitValetFeature}
                     server_error={server_error}
@@ -102,7 +103,7 @@ var FeatureTab = React.createClass({
 
             valetSection = (
                 <SettingItemMin
-                    title="Valet"
+                    title="Valet (Preview - EXPERTS ONLY)"
                     describe={describe}
                     updateSection={function(){self.props.updateSection("valet");}}
                 />