diff --git a/lib/formslib.php b/lib/formslib.php
index 6307a4cb361..8a0e5cc4419 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -189,10 +189,6 @@ abstract class moodleform {
             $this->_form->hardFreeze();
         }
 
-        // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
-        $element = $this->_form->addElement('hidden');
-        $element->setType('password');
-
         $this->definition();
 
         $this->_form->addElement('hidden', 'sesskey', null); // automatic sesskey protection
@@ -2703,6 +2699,8 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         $this->_collapseButtons = '';
         $formid = $form->getAttribute('id');
         parent::startForm($form);
+        // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
+        $this->_hiddenHtml .= prevent_form_autofill_password();
         if ($form->isFrozen()){
             $this->_formTemplate = "\n<div class=\"mform frozen\">\n{content}\n</div>";
         } else {
diff --git a/lib/weblib.php b/lib/weblib.php
index b2e7eeb81d0..858d82e6cd2 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3662,5 +3662,5 @@ function get_formatted_help_string($identifier, $component, $ajax = false, $a =
  * @return string HTML to prevent password autofill
  */
 function prevent_form_autofill_password() {
-    return '<div class="hide"><input type="password" /></div>';
+    return '<div class="hide"><input type="text" /><input type="password" /></div>';
 }