diff --git a/data/users.py b/data/users.py
index 13556a552..10c909cb8 100644
--- a/data/users.py
+++ b/data/users.py
@@ -202,8 +202,8 @@ class UserAuthentication(object):
       if decrypted is None:
         # This is a normal password.
         if features.REQUIRE_ENCRYPTED_BASIC_AUTH:
-          msg = ('Client login with passwords is disabled. Please generate a client token ' +
-                 'and use it in place of your password.')
+          msg = ('Client login with unecrypted passwords is disabled. Please generate an ' +
+                 'encrypted password in the user admin panel for use here.')
           return (None, msg)
       else:
         password = decrypted
diff --git a/static/directives/config/config-setup-tool.html b/static/directives/config/config-setup-tool.html
index aa0c60e5d..04ac2abf2 100644
--- a/static/directives/config/config-setup-tool.html
+++ b/static/directives/config/config-setup-tool.html
@@ -47,16 +47,16 @@
             </td>
           </tr>
           <tr>
-            <td class="non-input">Encrypted Client Tokens:</td>
+            <td class="non-input">Encrypted Client Password:</td>
             <td colspan="2">
               <div class="co-checkbox">
                 <input id="ftet" type="checkbox" ng-model="config.FEATURE_REQUIRE_ENCRYPTED_BASIC_AUTH">
-                <label for="ftet">Require Encrypted Client Tokens</label>
+                <label for="ftet">Require Encrypted Client Passwords</label>
               </div>
               <div class="help-text">
                  If enabled, users will not be able to login from the Docker command
                  line with a non-encrypted password and must generate an encrypted
-                 token to use.
+                 password to use.
               </div>
               <div class="help-text" ng-if="config.AUTHENTICATION_TYPE == 'LDAP'">
                 This feature is <strong>highly recommended</strong> for setups with LDAP authentication, as Docker currently stores passwords in <strong>plaintext</strong> on user's machines.
@@ -311,12 +311,12 @@
         </div>
 
         <div class="alert alert-warning" ng-if="config.AUTHENTICATION_TYPE == 'LDAP' && !config.FEATURE_REQUIRE_ENCRYPTED_BASIC_AUTH">
-          It is <strong>highly recommended</strong> to require encrypted client tokens. LDAP passwords used in the Docker client will be stored in <strong>plaintext</strong>!
+          It is <strong>highly recommended</strong> to require encrypted client passwords. LDAP passwords used in the Docker client will be stored in <strong>plaintext</strong>!
           <a href="javascript:void(0)" ng-click="config.FEATURE_REQUIRE_ENCRYPTED_BASIC_AUTH = true">Enable this requirement now</a>.
         </div>
 
         <div class="alert alert-success" ng-if="config.AUTHENTICATION_TYPE == 'LDAP' && config.FEATURE_REQUIRE_ENCRYPTED_BASIC_AUTH">
-          Note: The "Require Encrypted Client Tokens" feature is currently enabled which will
+          Note: The "Require Encrypted Client Passwords" feature is currently enabled which will
           prevent LDAP passwords from being saved as plaintext by the Docker client.
         </div>