diff --git a/app/templates/key-change.hbs b/app/templates/key-change.hbs
index b33e2d5e..b4b83272 100644
--- a/app/templates/key-change.hbs
+++ b/app/templates/key-change.hbs
@@ -5,13 +5,13 @@
         <div class="key-change__message">{{message}}:</div>
         <div class="key-change__input">
             <input class="key-change__file hide-by-pos" type="file"  />
-            <input class="key-change__pass" type="password" size="30" autocomplete="off" maxlength="1024" autofocus
+            <input class="key-change__pass" type="password" size="30" autocomplete="new-password" maxlength="1024" autofocus
                 placeholder="{{Res 'password'}}" />
             <div class="key-change__keyfile">
                 <i class="fa fa-key"></i> {{res 'openKeyFile'}}<span class="key-change__keyfile-name"></span>
             </div>
             {{#if repeat}}
-            <input class="key-change__pass-repeat" type="password" size="30" autocomplete="off" maxlength="1024"
+            <input class="key-change__pass-repeat" type="password" size="30" autocomplete="new-password" maxlength="1024"
                 placeholder="Repeat password" />
             {{/if}}
         </div>
diff --git a/app/templates/open.hbs b/app/templates/open.hbs
index de623ca5..eec21d89 100644
--- a/app/templates/open.hbs
+++ b/app/templates/open.hbs
@@ -68,7 +68,7 @@
             <div class="open__pass-warning muted-color invisible"><i class="fa fa-exclamation-triangle"></i> {{res 'openCaps'}}</div>
         </div>
         <div class="open__pass-field-wrap">
-            <input class="open__pass-input" type="password" size="30" autocomplete="off" maxlength="1024"
+            <input class="open__pass-input" type="password" size="30" autocomplete="new-password" maxlength="1024"
                    placeholder="{{res 'openClickToOpen'}}" readonly />
             <div class="open__pass-enter-btn"><i class="fa fa-level-down fa-rotate-90"></i></div>
             <div class="open__pass-opening-icon"><i class="fa fa-spinner fa-spin"></i></div>
diff --git a/app/templates/settings/settings-file.hbs b/app/templates/settings/settings-file.hbs
index fdc99d97..acd1e67b 100644
--- a/app/templates/settings/settings-file.hbs
+++ b/app/templates/settings/settings-file.hbs
@@ -50,7 +50,7 @@
             <i class="fa fa-warning"></i> {{res 'setFilePassChanged'}}
         </span>
     </label>
-    <input type="password" class="settings__input input-base" id="settings__file-master-pass" value="{{password}}" />
+    <input type="password" class="settings__input input-base" id="settings__file-master-pass" value="{{password}}" autocomplete="new-password" />
     <label for="settings__file-key-file">{{res 'setFileKeyFile'}}:</label>
     <select class="settings__select settings__select-no-margin input-base" id="settings__file-key-file"></select>
     <a id="settings__file-file-select-link">{{res 'setFileSelKeyFile'}}</a>