diff --git a/src/app/settings/views/settingsTwoStepDuo.html b/src/app/settings/views/settingsTwoStepDuo.html
index 850a0307654..98bdc427bac 100644
--- a/src/app/settings/views/settingsTwoStepDuo.html
+++ b/src/app/settings/views/settingsTwoStepDuo.html
@@ -57,7 +57,7 @@
             <div class="form-group" show-errors>
                 <label for="skey">Secret Key</label>
                 <input type="password" id="skey" name="SecretKey" ng-model="updateModel.skey" class="form-control"
-                       required api-field />
+                       required api-field autocomplete="new-password" />
             </div>
             <div class="form-group" show-errors>
                 <label for="host">API Hostname</label>
diff --git a/src/app/settings/views/settingsTwoStepYubi.html b/src/app/settings/views/settingsTwoStepYubi.html
index 9b2a6ad67eb..16feae1f887 100644
--- a/src/app/settings/views/settingsTwoStepYubi.html
+++ b/src/app/settings/views/settingsTwoStepYubi.html
@@ -77,7 +77,7 @@
                 {{updateModel.key1.existingKey}}
             </div>
             <input type="password" id="key1" name="Key1" ng-model="updateModel.key1.key" class="form-control" api-field
-                   ng-show="!updateModel.key1.existingKey" />
+                   ng-show="!updateModel.key1.existingKey" autocomplete="new-password" />
         </div>
         <div class="form-group" show-errors>
             <label for="key2">YubiKey #2</label>
@@ -88,7 +88,7 @@
                 {{updateModel.key2.existingKey}}
             </div>
             <input type="password" id="key2" name="Key2" ng-model="updateModel.key2.key" class="form-control" api-field
-                   ng-show="!updateModel.key2.existingKey" />
+                   ng-show="!updateModel.key2.existingKey" autocomplete="new-password" />
         </div>
         <div class="form-group" show-errors>
             <label for="key3">YubiKey #3</label>
@@ -99,7 +99,7 @@
                 {{updateModel.key3.existingKey}}
             </div>
             <input type="password" id="key3" name="Key3" ng-model="updateModel.key3.key" class="form-control" api-field
-                   ng-show="!updateModel.key3.existingKey" />
+                   ng-show="!updateModel.key3.existingKey" autocomplete="new-password" />
         </div>
         <strong>NFC Support</strong>
         <div class="checkbox">