diff --git a/lib/formslib.php b/lib/formslib.php
index 27bbae763f7..a616133d5d0 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2259,10 +2259,10 @@ var skipClientValidation = false;
       }
     }
 
-    document.getElementById(\'id_' . $elementName . '\').addEventListener(\'blur\', function(ev) {
+    document.getElementById(\'' . $element->_attributes['id'] . '\').addEventListener(\'blur\', function(ev) {
         ' . $valFunc . '
     });
-    document.getElementById(\'id_' . $elementName . '\').addEventListener(\'change\', function(ev) {
+    document.getElementById(\'' . $element->_attributes['id'] . '\').addEventListener(\'change\', function(ev) {
         ' . $valFunc . '
     });
 ';
diff --git a/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php b/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php
index cf89eadb269..cc0e4ee4bf0 100644
--- a/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php
+++ b/lib/pear/HTML/QuickForm/DHTMLRulesTableless.php
@@ -198,11 +198,6 @@ function validate_' . $this->_attributes['id'] . '(frm) {
     } // end func getValidationScript
 
     // }}}
-
-    function display() {
-        $this->getValidationScript();
-        return parent::display();
-    }
 }
 
-?>
\ No newline at end of file
+?>