diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 77fc14a48..50c4b34ee 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2240,7 +2240,7 @@ define([
 
         // Password
         var password = h('div.cp-creation-password', [
-            UI.createCheckbox('cp-creation-password', Messages.creation_password, false),
+            UI.createCheckbox('cp-creation-password', Messages.properties_addPassword, false),
             h('span.cp-creation-password-picker.cp-creation-slider', [
                 UI.passwordInput({id: 'cp-creation-password-val'})
                 /*h('input#cp-creation-password-val', {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 7715b39b8..43946a502 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2495,7 +2495,7 @@ define([
                 h('h4', Messages.sharedFolders_create),
                 h('label', {for: 'cp-app-drive-sf-name'}, Messages.sharedFolders_create_name),
                 h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder}),
-                h('label', {for: 'cp-app-drive-sf-password'}, Messages.sharedFolders_create_password),
+                h('label', {for: 'cp-app-drive-sf-password'}, Messages.fm_shareFolderPassword),
                 UI.passwordInput({id: 'cp-app-drive-sf-password'}),
                 h('span', {
                     style: 'display:flex;align-items:center;justify-content:space-between'
diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js
index 9d4360fae..1d26ea08d 100644
--- a/www/common/sframe-common-file.js
+++ b/www/common/sframe-common-file.js
@@ -313,7 +313,7 @@ define([
                 UIElements.setHTML(h('label', {for: 'cp-upload-name'}),
                                    Messages._getKey('upload_modal_filename', [ext])),
                 h('input#cp-upload-name', {type: 'text', placeholder: defaultFileName, value: defaultFileName}),
-                h('label', {for: 'cp-upload-password'}, Messages.creation_passwordValue),
+                h('label', {for: 'cp-upload-password'}, Messages.addOptionalPassword),
                 UI.passwordInput({id: 'cp-upload-password'}),
                 h('span', {
                     style: 'display:flex;align-items:center;justify-content:space-between'
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index c46a0641d..9ff3d7d6e 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -55,6 +55,7 @@ define([
     var ctx = {};
 
     funcs.Messages = Messages;
+Messages.addOptionalPassword = "Add a password (optional)"; // XXX
 
     var evRealtimeSynced = Util.mkEvent(true);