diff --git a/src/bootstrap/PasswordInput.js b/src/bootstrap/PasswordInput.js
index ee93928..17cfbbd 100644
--- a/src/bootstrap/PasswordInput.js
+++ b/src/bootstrap/PasswordInput.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ * Copyright (C) 2019-2022 CZ.NIC z.s.p.o. (https://www.nic.cz/)
  *
  * This is free software, licensed under the GNU General Public License v3.
  * See /LICENSE for more information.
@@ -21,14 +21,17 @@ PasswordInput.propTypes = {
     helpText: PropTypes.string,
     /** Use show/hide password button. */
     withEye: PropTypes.bool,
+    /** Use new-password in autocomplete attribute. */
+    newPass: PropTypes.bool,
 };
 
-export function PasswordInput({ withEye, ...props }) {
+export function PasswordInput({ withEye, newPass, ...props }) {
     const [isHidden, setHidden] = useState(true);
+
     return (
         <Input
             type={withEye && !isHidden ? "text" : "password"}
-            autoComplete={isHidden ? "new-password" : null}
+            autoComplete={newPass ? "new-password" : "current-password"}
             {...props}
         >
             {withEye ? (
diff --git a/src/bootstrap/__tests__/__snapshots__/PasswordInput.test.js.snap b/src/bootstrap/__tests__/__snapshots__/PasswordInput.test.js.snap
index 5022b37..0bbe9ea 100644
--- a/src/bootstrap/__tests__/__snapshots__/PasswordInput.test.js.snap
+++ b/src/bootstrap/__tests__/__snapshots__/PasswordInput.test.js.snap
@@ -13,7 +13,7 @@ exports[`<PasswordInput/> Render password input 1`] = `
     class="input-group"
   >
     <input
-      autocomplete="new-password"
+      autocomplete="current-password"
       class="form-control"
       id="1"
       type="password"
diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index 2df4c6b..24124bb 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -394,7 +394,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +           class=\\"input-group\\"
 +         >
 +           <input
-+             autocomplete=\\"new-password\\"
++             autocomplete=\\"current-password\\"
 +             class=\\"form-control  is-invalid\\"
 +             id=\\"23\\"
 +             required=\\"\\"
@@ -509,7 +509,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           class=\\"input-group\\"
 +         >
 +           <input
-+             autocomplete=\\"new-password\\"
++             autocomplete=\\"current-password\\"
 +             class=\\"form-control\\"
 +             id=\\"5\\"
 +             required=\\"\\"