diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 4eb923bb1e25ebb932522d088a00f4f3d7d4404d..984700d415282fe584c1491600414ed823c44ef7 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -321,13 +321,20 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         $disabled = $cando ? '' : ' disabled="disabled"';
         echo str_pad('',$indent);
 
-        $fieldtype = ($name == "userpass") ? 'password'  : 'text';
+        if($name == 'userpass'){
+            $fieldtype = 'password';
+            $autocomp  = 'autocomplete="off"';
+        }else{
+            $fieldtype = 'text';
+            $autocomp  = '';
+        }
+
 
         echo "<tr $class>";
         echo "<td><label for=\"$id\" >$label: </label></td>";
         echo "<td>";
         if($cando){
-            echo "<input type=\"$fieldtype\" id=\"$id\" name=\"$name\" value=\"$value\" class=\"edit\" />";
+            echo "<input type=\"$fieldtype\" id=\"$id\" name=\"$name\" value=\"$value\" class=\"edit\" $autocomp />";
         }else{
             echo "<input type=\"hidden\" name=\"$name\" value=\"$value\" />";
             echo "<input type=\"$fieldtype\" id=\"$id\" name=\"$name\" value=\"$value\" class=\"edit disabled\" disabled=\"disabled\" />";