diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 042c7e7c1..532d6eacc 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,26 +6,11 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
+    <H2CodeStyleSettings version="5">
+      <option name="USE_GENERAL_STYLE" value="false" />
+    </H2CodeStyleSettings>
     <JSCodeStyleSettings version="0">
       <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
     </JSCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
-    </JetCodeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/src/public/app/dialogs/options/credentials.js b/src/public/app/dialogs/options/credentials.js
index 524293ff0..ce8c1a85c 100644
--- a/src/public/app/dialogs/options/credentials.js
+++ b/src/public/app/dialogs/options/credentials.js
@@ -8,6 +8,11 @@ const TPL = `
 <p>Your username is <strong id="credentials-username"></strong>.</p>
 
 <h3>Change password</h3>
+
+<div class="alert alert-warning" role="alert" style="font-weight: bold; color: red !important;">
+  Please take care to remember your new password. Password is used to encrypt protected notes. If you forget your password, then all your protected notes are forever lost with no recovery options.
+</div>
+
 <form id="change-password-form">
     <div class="form-group">
         <label for="old-password">Old password</label>