diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 5955b6725..c9bb17a7c 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -297,7 +297,7 @@
                 .cp-creation-password-warning {
                     margin-top: 0.4rem;
                     font-size: 0.75em;
-                    line-height: 100%;
+                    line-height: 120%;
                 }
             }
             .cp-creation-settings {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 4882efbe1..3433f297d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -26,8 +26,6 @@ define([
 ], function ($, Config, Broadcast, Util, Hash, Language, UI, Constants, Feedback, h, Clipboard,
              Messages, AppConfig, Pages, NThen, InviteInner, Visible, PadTypes) {
 
-    Messages.form_passwordWarning = 'For Forms, you can only set the password during creation. It cannot be changed later.' //XX
-
     var UIElements = {};
     var urlArgs = Config.requireConf.urlArgs;
 
@@ -2775,7 +2773,7 @@ define([
         // Password
         let text;
         if (type === 'form') {
-            text =  h('div.cp-creation-password-warning.alert.alert-warning.dismissable', h('span.cp-inline-alert-text', Messages.form_passwordWarning));
+            text =  h('div.cp-creation-password-warning.alert.alert-info.dismissable', h('span.cp-inline-alert-text', Messages.form_passwordWarning));
         }
         var password = h('div.cp-creation-password',  [ 
             UI.createCheckbox('cp-creation-password', Messages.properties_addPassword, false),