From 2e84f76f8a85e6c2575affcbd7e18bad976c7a5d Mon Sep 17 00:00:00 2001
From: rfeese <rfeese@gmail.com>
Date: Fri, 30 Dec 2022 13:35:37 -0600
Subject: [PATCH] Added autocomplete attribute to known password fields (#2700)

---
 .all-contributorsrc                                      | 9 +++++++++
 README.md                                                | 1 +
 .../base/default/template/checkout/onepage/billing.phtml | 5 +++--
 .../base/default/template/checkout/onepage/login.phtml   | 2 +-
 .../default/template/customer/form/changepassword.phtml  | 7 ++++---
 .../base/default/template/customer/form/edit.phtml       | 7 ++++---
 .../base/default/template/customer/form/login.phtml      | 2 +-
 .../base/default/template/customer/form/mini.login.phtml | 4 ++--
 .../base/default/template/customer/form/register.phtml   | 5 +++--
 .../template/customer/form/resetforgottenpassword.phtml  | 5 +++--
 .../template/oauth/authorize/form/login-simple.phtml     | 2 +-
 .../default/template/oauth/authorize/form/login.phtml    | 2 +-
 .../template/persistent/checkout/onepage/billing.phtml   | 5 +++--
 .../template/persistent/checkout/onepage/login.phtml     | 2 +-
 .../template/persistent/customer/form/login.phtml        | 2 +-
 .../template/persistent/customer/form/register.phtml     | 5 +++--
 .../default/iphone/template/customer/form/login.phtml    | 2 +-
 .../template/persistent/checkout/onepage/login.phtml     | 2 +-
 .../iphone/template/persistent/customer/form/login.phtml | 2 +-
 .../default/template/customer/form/changepassword.phtml  | 7 ++++---
 .../rwd/default/template/customer/form/edit.phtml        | 7 ++++---
 .../rwd/default/template/customer/form/mini.login.phtml  | 4 ++--
 .../template/customer/form/resetforgottenpassword.phtml  | 5 +++--
 .../template/oauth/authorize/form/login-simple.phtml     | 2 +-
 .../template/persistent/checkout/onepage/billing.phtml   | 5 +++--
 .../template/persistent/checkout/onepage/login.phtml     | 2 +-
 .../template/persistent/customer/form/login.phtml        | 2 +-
 .../template/persistent/customer/form/register.phtml     | 5 +++--
 28 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index eabd644b004..443cc3ae4ec 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1351,6 +1351,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rfeese",
+      "name": "Roger Feese",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7074181?v=4",
+      "profile": "https://github.com/rfeese",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7
diff --git a/README.md b/README.md
index 4c96da6b471..206892f3cfa 100644
--- a/README.md
+++ b/README.md
@@ -450,6 +450,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/eneiasramos"><img src="https://avatars.githubusercontent.com/u/2862728?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Enéias Ramos de Melo</b></sub></a></td>
     <td align="center"><a href="https://github.com/discountscott"><img src="https://avatars.githubusercontent.com/u/5454596?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Scott Moore</b></sub></a></td>
+    <td align="center"><a href="https://github.com/rfeese"><img src="https://avatars.githubusercontent.com/u/7074181?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Roger Feese</b></sub></a></td>
   </tr>
 </table>
 
diff --git a/app/design/frontend/base/default/template/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
index 3588e8b3026..ae6f9de9646 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/billing.phtml
@@ -159,7 +159,8 @@
                                    name="billing[customer_password]"
                                    id="billing:customer_password"
                                    title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>"
-                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>" />
+                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
+                                   autocomplete="off" />
                             <p class="form-instructions">
                                 <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                             </p>
@@ -168,7 +169,7 @@
                     <div class="field">
                         <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
                         <div class="input-box">
-                            <input type="password" name="billing[confirm_password]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
+                            <input type="password" name="billing[confirm_password]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" autocomplete="off" />
                         </div>
                     </div>
                 </li>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
index 723089c0989..ba6f4f6743e 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/login.phtml
@@ -74,7 +74,7 @@
                 <li>
                     <label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                     <div class="input-box">
-                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
+                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" autocomplete="off" />
                     </div>
                 </li>
                 <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/base/default/template/customer/form/changepassword.phtml b/app/design/frontend/base/default/template/customer/form/changepassword.phtml
index 3af1b8e635c..8381eb085e6 100644
--- a/app/design/frontend/base/default/template/customer/form/changepassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/changepassword.phtml
@@ -29,7 +29,7 @@
         <li>
             <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
             <div class="input-box">
-                <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" />
+                <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" autocomplete="off" />
             </div>
         </li>
         <li class="fields">
@@ -41,7 +41,8 @@
                            title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>"
                            class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
                            name="password"
-                           id="password" />
+                           id="password"
+                           autocomplete="new-password" />
                     <p class="form-instructions">
                         <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                     </p>
@@ -50,7 +51,7 @@
             <div class="field">
                 <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
                 <div class="input-box">
-                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
+                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" autocomplete="new-password" />
                 </div>
             </div>
         </li>
diff --git a/app/design/frontend/base/default/template/customer/form/edit.phtml b/app/design/frontend/base/default/template/customer/form/edit.phtml
index 7407ec55923..e15f5ce928b 100644
--- a/app/design/frontend/base/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/form/edit.phtml
@@ -54,7 +54,7 @@
                 <div class="input-box">
                     <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
                     <input type="text" class="input-text no-display" name="dummy" id="dummy" />
-                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" />
+                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" autocomplete="off" />
                 </div>
             </li>
             <li class="control">
@@ -74,7 +74,8 @@
                                title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>"
                                class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
                                name="password"
-                               id="password" />
+                               id="password"
+                               autocomplete="new-password" />
                         <p class="form-instructions">
                             <?php echo $this->__('The minimum password length is %s', $minPasswordLength) ?>
                         </p>
@@ -83,7 +84,7 @@
                 <div class="field">
                     <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
                     <div class="input-box">
-                        <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
+                        <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" autocomplete="new-password" />
                     </div>
                 </div>
             </li>
diff --git a/app/design/frontend/base/default/template/customer/form/login.phtml b/app/design/frontend/base/default/template/customer/form/login.phtml
index 044fda4d006..3a083532ce6 100644
--- a/app/design/frontend/base/default/template/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/customer/form/login.phtml
@@ -56,7 +56,7 @@
                         <li>
                             <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                             <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" />
+                                <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" autocomplete="off" />
                             </div>
                         </li>
                         <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/base/default/template/customer/form/mini.login.phtml b/app/design/frontend/base/default/template/customer/form/mini.login.phtml
index cb7235301ee..98e2bfb10af 100644
--- a/app/design/frontend/base/default/template/customer/form/mini.login.phtml
+++ b/app/design/frontend/base/default/template/customer/form/mini.login.phtml
@@ -33,11 +33,11 @@
         <?php echo $this->getBlockHtml('formkey') ?>
         <div class="block-content">
             <label for="mini-login"><?php echo $this->__('Email:') ?></label><input type="text" name="login[username]" id="mini-login" class="input-text" />
-            <label for="mini-password"><?php echo $this->__('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" />
+            <label for="mini-password"><?php echo $this->__('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" autocomplete="off" />
             <div class="actions">
                 <button type="submit" class="button"><span><span><?php echo $this->__('Login') ?></span></span></button>
             </div>
         </div>
     </form>
 </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/design/frontend/base/default/template/customer/form/register.phtml b/app/design/frontend/base/default/template/customer/form/register.phtml
index 0adbe643c5f..8f0cccc8bd4 100644
--- a/app/design/frontend/base/default/template/customer/form/register.phtml
+++ b/app/design/frontend/base/default/template/customer/form/register.phtml
@@ -161,7 +161,8 @@
                                    name="password"
                                    id="password"
                                    title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>"
-                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>" />
+                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
+                                   autocomplete="off" />
                             <p class="form-instructions">
                                 <?php echo $this->__('The minimum password length is %s', $minPasswordLength) ?>
                             </p>
@@ -170,7 +171,7 @@
                     <div class="field">
                         <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
                         <div class="input-box">
-                            <input type="password" name="confirmation" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
+                            <input type="password" name="confirmation" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" autocomplete="off" />
                         </div>
                     </div>
                 </li>
diff --git a/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml b/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
index 365b56e200d..d4c31d6ddbb 100644
--- a/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/resetforgottenpassword.phtml
@@ -33,7 +33,8 @@
                         <input type="password"
                                class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength; ?>"
                                name="password"
-                               id="password" />
+                               id="password"
+                               autocomplete="off" />
                         <p class="form-instructions">
                             <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength); ?>
                         </p>
@@ -42,7 +43,7 @@
                 <div class="field">
                     <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password'); ?></label>
                     <div class="input-box">
-                        <input type="password" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
+                        <input type="password" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" autocomplete="off "/>
                     </div>
                 </div>
             </li>
diff --git a/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml
index 2a5cd92d582..0dc830a930f 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/form/login-simple.phtml
@@ -52,7 +52,7 @@
                                     <em class="required">*</em>&nbsp;<?php echo $this->__('Password') ?>
                                 </label>
                                 <input type="password" id="login" name="login[password]" class="required-entry input-text"
-                                       value=""/></div>
+                                       value="" autocomplete="off" /></div>
                             <div class="clear"></div>
                             <div class="form-buttons">
                                 <button type="submit" class="form-button"
diff --git a/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml b/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml
index 6c0105d9aef..f487089fa34 100644
--- a/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml
+++ b/app/design/frontend/base/default/template/oauth/authorize/form/login.phtml
@@ -47,7 +47,7 @@ $rejectJs = "document.location.href='{$this->getRejectUrl()}';";
                             <li>
                                 <label for="pass"><?php echo $this->__('Password') ?></label>
                                 <div class="input-box">
-                                    <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo $this->__('Password') ?>" />
+                                    <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo $this->__('Password') ?>" autocomplete="off" />
                                 </div>
                             </li>
                         </ul>
diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
index 8c8bdd0bab3..c263d3c54e0 100644
--- a/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
+++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/billing.phtml
@@ -157,7 +157,8 @@
                                    name="billing[customer_password]"
                                    id="billing:customer_password"
                                    title="<?php echo $this->quoteEscape($this->__('Password')) ?>"
-                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>" />
+                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
+                                   autocomplete="off" />
                             <p class="form-instructions">
                                 <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                             </p>
@@ -166,7 +167,7 @@
                     <div class="field">
                         <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
                         <div class="input-box">
-                            <input type="password" name="billing[confirm_password]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
+                            <input type="password" name="billing[confirm_password]" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" autocomplete="off" />
                         </div>
                     </div>
                 </li>
diff --git a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
index a2df7680248..b7ef1e72801 100644
--- a/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml
@@ -81,7 +81,7 @@
                 <li>
                     <label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                     <div class="input-box">
-                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
+                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" autocomplete="off" />
                     </div>
                 </li>
                 <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
index db6711c31f3..e6ace0c01d4 100644
--- a/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/base/default/template/persistent/customer/form/login.phtml
@@ -55,7 +55,7 @@
                         <li>
                             <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                             <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text required-entry" id="pass" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" />
+                                <input type="password" name="login[password]" class="input-text required-entry" id="pass" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Password')) ?>" autocomplete="off" />
                             </div>
                         </li>
                         <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/base/default/template/persistent/customer/form/register.phtml b/app/design/frontend/base/default/template/persistent/customer/form/register.phtml
index fab52415d5e..444b5a3d2de 100644
--- a/app/design/frontend/base/default/template/persistent/customer/form/register.phtml
+++ b/app/design/frontend/base/default/template/persistent/customer/form/register.phtml
@@ -158,7 +158,8 @@
                                    name="password"
                                    id="password"
                                    title="<?php echo $this->quoteEscape($this->__('Password')) ?>"
-                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>" />
+                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
+                                   autocomplete="off" />
                             <p class="form-instructions">
                                 <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                             </p>
@@ -167,7 +168,7 @@
                     <div class="field">
                         <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
                         <div class="input-box">
-                            <input type="password" name="confirmation" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
+                            <input type="password" name="confirmation" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" autocomplete="off" />
                         </div>
                     </div>
                 </li>
diff --git a/app/design/frontend/default/iphone/template/customer/form/login.phtml b/app/design/frontend/default/iphone/template/customer/form/login.phtml
index 4a3cdf7fe01..daf2e46c90d 100644
--- a/app/design/frontend/default/iphone/template/customer/form/login.phtml
+++ b/app/design/frontend/default/iphone/template/customer/form/login.phtml
@@ -49,7 +49,7 @@
                         <li>
                             <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                             <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo $this->__('Password') ?>" />
+                                <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo $this->__('Password') ?>" autocomplete="off" />
                             </div>
                         </li>
                         <li class="note">
diff --git a/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml
index b44924950c4..435b6d39952 100644
--- a/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml
+++ b/app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml
@@ -46,7 +46,7 @@
                 <li>
                     <label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                     <div class="input-box">
-                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
+                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" autocomplete="off" />
                     </div>
                 </li>
                 <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml b/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
index b445b6e6fe6..8cb4f34e2ea 100644
--- a/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml
@@ -48,7 +48,7 @@
                         <li>
                             <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                             <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo $this->__('Password') ?>" />
+                                <input type="password" name="login[password]" class="input-text required-entry validate-password min-pass-length-5" id="pass" title="<?php echo $this->__('Password') ?>" autocomplete="off" />
                             </div>
                         </li>
                         <li class="note">
diff --git a/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml b/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
index eb9ec5f0c16..09e9dd24369 100644
--- a/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
@@ -30,7 +30,7 @@
         <li>
             <label for="current_password" class="required"><em>*</em><?php echo $this->__('Current Password') ?></label>
             <div class="input-box">
-                <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" />
+                <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" autocomplete="off" />
             </div>
         </li>
         <li class="fields">
@@ -42,7 +42,8 @@
                            title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>"
                            class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
                            name="password"
-                           id="password" />
+                           id="password"
+                           autocomplete="new-password" />
                     <p class="form-instructions">
                         <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                     </p>
@@ -51,7 +52,7 @@
             <div class="field">
                 <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
                 <div class="input-box">
-                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
+                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" autocomplete="new-password" />
                 </div>
             </div>
         </li>
diff --git a/app/design/frontend/rwd/default/template/customer/form/edit.phtml b/app/design/frontend/rwd/default/template/customer/form/edit.phtml
index 42bada2019f..fbac757b2f3 100644
--- a/app/design/frontend/rwd/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/edit.phtml
@@ -55,7 +55,7 @@
                 <div class="input-box">
                     <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
                     <input type="text" class="input-text no-display" name="dummy" id="dummy" />
-                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" />
+                    <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Current Password')) ?>" class="input-text required-entry" name="current_password" id="current_password" autocomplete="off" />
                 </div>
             </li>
             <li class="control">
@@ -75,7 +75,8 @@
                                title="<?php echo Mage::helper('core')->quoteEscape($this->__('New Password')) ?>"
                                class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
                                name="password"
-                               id="password" />
+                               id="password"
+                               autocomplete="new-password" />
                         <p class="form-instructions">
                             <?php echo $this->__('The minimum password length is %s', $minPasswordLength) ?>
                         </p>
@@ -84,7 +85,7 @@
                 <div class="field">
                     <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password') ?></label>
                     <div class="input-box">
-                        <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
+                        <input type="password" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Confirm New Password')) ?>" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" autocomplete="new-password" />
                     </div>
                 </div>
             </li>
diff --git a/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml b/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml
index 849251064f2..69a6f7650d5 100644
--- a/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/mini.login.phtml
@@ -33,11 +33,11 @@
         <?php echo $this->getBlockHtml('formkey') ?>
         <div class="block-content">
             <label for="mini-login"><?php echo $this->__('Email:') ?></label><input type="email" autocapitalize="off" autocorrect="off" spellcheck="false" name="login[username]" id="mini-login" class="input-text" />
-            <label for="mini-password"><?php echo $this->__('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" />
+            <label for="mini-password"><?php echo $this->__('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" autocomplete="off" />
             <div class="actions">
                 <button type="submit" class="button"><span><span><?php echo $this->__('Login') ?></span></span></button>
             </div>
         </div>
     </form>
 </div>
-<?php endif ?>
\ No newline at end of file
+<?php endif ?>
diff --git a/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml b/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
index 2577eca61dd..653b9dc020f 100644
--- a/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/resetforgottenpassword.phtml
@@ -34,7 +34,8 @@
                         <input type="password"
                                class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength; ?>"
                                name="password"
-                               id="password" />
+                               id="password"
+                               autocomplete="new-password" />
                         <p class="form-instructions">
                             <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength); ?>
                         </p>
@@ -43,7 +44,7 @@
                 <div class="field">
                     <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm New Password'); ?></label>
                     <div class="input-box">
-                        <input type="password" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" />
+                        <input type="password" class="input-text required-entry validate-cpassword" name="confirmation" id="confirmation" autocomplete="new-password" />
                     </div>
                 </div>
             </li>
diff --git a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml
index d1ca0941031..29d8fa1fe44 100644
--- a/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml
+++ b/app/design/frontend/rwd/default/template/oauth/authorize/form/login-simple.phtml
@@ -52,7 +52,7 @@
                                     <em class="required">*</em>&nbsp;<?php echo $this->__('Password') ?>
                                 </label>
                                 <input type="password" id="login" name="login[password]" class="required-entry input-text"
-                                       value=""/></div>
+                                       value="" autocomplete="off" /></div>
                             <div class="clear"></div>
                             <div class="form-buttons">
                                 <button type="submit" class="form-button"
diff --git a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
index 35e05b25ae6..f8db68047ef 100644
--- a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
+++ b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/billing.phtml
@@ -160,7 +160,8 @@
                                    name="billing[customer_password]"
                                    id="billing:customer_password"
                                    title="<?php echo $this->quoteEscape($this->__('Password')) ?>"
-                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>" />
+                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
+                                   autocomplete="new-password" />
                             <p class="form-instructions">
                                 <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                             </p>
@@ -169,7 +170,7 @@
                     <div class="field">
                         <label for="billing:confirm_password" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
                         <div class="input-box">
-                            <input type="password" name="billing[confirm_password]" title="<?php echo $this->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" />
+                            <input type="password" name="billing[confirm_password]" title="<?php echo $this->quoteEscape($this->__('Confirm Password')) ?>" id="billing:confirm_password" class="input-text required-entry validate-cpassword" autocomplete="new-password" />
                         </div>
                     </div>
                 </li>
diff --git a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml
index bd6c24ae3f1..cf148b49bd1 100644
--- a/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml
+++ b/app/design/frontend/rwd/default/template/persistent/checkout/onepage/login.phtml
@@ -99,7 +99,7 @@
                 <li>
                     <label for="login-password" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                     <div class="input-box">
-                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" />
+                        <input type="password" class="input-text required-entry" id="login-password" name="login[password]" autocomplete="off" />
                     </div>
                 </li>
                 <li>
diff --git a/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml b/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml
index 87f4ada480a..712d02e9cc4 100644
--- a/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml
+++ b/app/design/frontend/rwd/default/template/persistent/customer/form/login.phtml
@@ -72,7 +72,7 @@
                         <li>
                             <label for="pass" class="required"><em>*</em><?php echo $this->__('Password') ?></label>
                             <div class="input-box">
-                                <input type="password" name="login[password]" class="input-text required-entry" id="pass" title="<?php echo $this->quoteEscape($this->__('Password')) ?>" />
+                                <input type="password" name="login[password]" class="input-text required-entry" id="pass" title="<?php echo $this->quoteEscape($this->__('Password')) ?>" autocomplete="off" />
                             </div>
                         </li>
                         <?php echo $this->getChildHtml('form.additional.info'); ?>
diff --git a/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml b/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml
index dc1c4502ad2..25319da4ce6 100644
--- a/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml
+++ b/app/design/frontend/rwd/default/template/persistent/customer/form/register.phtml
@@ -147,7 +147,8 @@
                                    name="password"
                                    id="password"
                                    title="<?php echo $this->quoteEscape($this->__('Password')) ?>"
-                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>" />
+                                   class="input-text required-entry validate-password min-pass-length-<?php echo $minPasswordLength ?>"
+                                   autocomplete="new-password" />
                             <p class="form-instructions">
                                 <?php echo Mage::helper('customer')->__('The minimum password length is %s', $minPasswordLength) ?>
                             </p>
@@ -156,7 +157,7 @@
                     <div class="field">
                         <label for="confirmation" class="required"><em>*</em><?php echo $this->__('Confirm Password') ?></label>
                         <div class="input-box">
-                            <input type="password" name="confirmation" title="<?php echo $this->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" />
+                            <input type="password" name="confirmation" title="<?php echo $this->quoteEscape($this->__('Confirm Password')) ?>" id="confirmation" class="input-text required-entry validate-cpassword" autocomplete="new-password" />
                         </div>
                     </div>
                 </li>