diff --git a/client_asset_add_modal.php b/client_asset_add_modal.php
index 7710108e..a21c9069 100644
--- a/client_asset_add_modal.php
+++ b/client_asset_add_modal.php
@@ -287,7 +287,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="password" placeholder="Password">
+                  <input type="text" class="form-control" name="password" placeholder="Password" autocomplete="new-password">
                 </div>
               </div>
 
diff --git a/client_asset_copy_modal.php b/client_asset_copy_modal.php
index 15fbe2cb..f465ad4f 100644
--- a/client_asset_copy_modal.php
+++ b/client_asset_copy_modal.php
@@ -296,7 +296,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="password" placeholder="Password">
+                  <input type="text" class="form-control" name="password" placeholder="Password" autocomplete="new-password">
                 </div>
               </div>
 
diff --git a/client_asset_edit_modal.php b/client_asset_edit_modal.php
index 0de25568..a834b4d4 100644
--- a/client_asset_edit_modal.php
+++ b/client_asset_edit_modal.php
@@ -297,7 +297,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>">
+                  <input type="text" class="form-control" name="password" placeholder="Password" value="<?php echo $login_password; ?>" autocomplete="new-password">
                 </div>
               </div>
 
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index d34c1519..c2b22cc1 100644
--- a/client_login_add_modal.php
+++ b/client_login_add_modal.php
@@ -55,7 +55,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" required>
+                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" required autocomplete="new-password">
                   <div class="input-group-append">
                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                   </div>
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 56bb7bc8..57aa63a9 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_modal.php
@@ -55,7 +55,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>" required>
+                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>" required autocomplete="new-password">
                   <div class="input-group-append">
                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                   </div>
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index 2abc8f82..b40a3826 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -216,7 +216,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password">
+                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" autocomplete="new-password">
                   <div class="input-group-append">
                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                   </div>
diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php
index ce0a582a..a7b14ab4 100644
--- a/client_software_edit_modal.php
+++ b/client_software_edit_modal.php
@@ -216,7 +216,7 @@
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                   </div>
-                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>">
+                  <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>" autocomplete="new-password">
                   <div class="input-group-append">
                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                   </div>
diff --git a/settings-backup.php b/settings-backup.php
index bb93ebbd..103555fb 100644
--- a/settings-backup.php
+++ b/settings-backup.php
@@ -19,10 +19,9 @@
     </div>
     <div class="card-body">
         <center>
-            <!--<a class="btn btn-primary btn-lg p-3" href="post.php?download_database"><i class="fa fa-fw fa-4x fa-key"></i><br><br>Get AES Master Key</a> -->
             <form action="post.php" method="POST">
                 <div class="input-group col-3">
-                    <input type="password" class="form-control" placeholder="Account Password" name="password" value="" required="">
+                    <input type="password" class="form-control" placeholder="Account Password" name="password" autocomplete="new-password" required>
                 </div>
                 <br>
                 <div class="input-group col-3 offset-2">
diff --git a/settings-general.php b/settings-general.php
index bc56a367..a988f708 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -46,12 +46,12 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-keyboard"></i></span>
           </div>
-          <input type="password" class="form-control" name="meshcentral_secret" placeholder="Auto-generated on MeshCentral" value="<?php echo $config_meshcentral_secret; ?>">
+          <input type="password" class="form-control" name="meshcentral_secret" placeholder="Auto-generated on MeshCentral" value="<?php echo $config_meshcentral_secret; ?>" autocomplete="new-password">
         </div>
       </div>
 
       <div class="form-group">
-        <div class="alert alert-warning" role="alert">
+        <div class="alert alert-warning">
           This token/user only requires <b>read access</b> to MeshCentral and is stored in <b>plaintext</b>.
         </div>
       </div>
diff --git a/settings-mail.php b/settings-mail.php
index b2ec6565..84d4b4b9 100644
--- a/settings-mail.php
+++ b/settings-mail.php
@@ -43,7 +43,7 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
           </div>
-          <input type="password" class="form-control" data-toggle="password" name="config_smtp_password" placeholder="Password" value="<?php echo $config_smtp_password; ?>" required>
+          <input type="password" class="form-control" data-toggle="password" name="config_smtp_password" placeholder="Password" value="<?php echo $config_smtp_password; ?>" autocomplete="new-password" required>
           <div class="input-group-append">
             <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
           </div>