diff --git a/lib/formslib.php b/lib/formslib.php
index 72d39f5..8e8bb77 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2139,16 +2139,17 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
 
         if (isset($this->_advancedElements[$name])){
             $PAGE->requires->yui_lib('event');
+            $PAGE->requires->string_for_js('showadvanced', 'form');
+            $PAGE->requires->string_for_js('hideadvanced', 'form');
+            $PAGE->requires->js_function_call('showAdvancedInit', array('mform_advancedbutton', $elementName, $buttonlabel));
+
             // this is tricky - the first submit button on form is "clicked" if user presses enter
             // we do not want to "submit" using advanced button if javascript active
             $button_nojs = '<input name="'.$elementName.'" value="'.$buttonlabel.'" type="submit" />';
 
             $buttonlabel = addslashes_js($buttonlabel);
-            $showtext = addslashes_js(get_string('showadvanced', 'form'));
-            $hidetext = addslashes_js(get_string('hideadvanced', 'form'));
-            $button = '<script id="' . $name . '_script" type="text/javascript">' . "
-showAdvancedInit('{$name}_script', '$elementName', '$buttonlabel', '$hidetext', '$showtext');
-" . '</script><noscript><div style="display:inline">'.$button_nojs.'</div></noscript>';  // the extra div should fix xhtml validation
+
+            $button = '<noscript id="mform_advancedbutton"><div style="display:inline">'.$button_nojs.'</div></noscript>';  // the extra div should fix xhtml validation
 
             $header_html = str_replace('{button}', $button, $header_html);
         } else {
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index bd42ac7..704e508 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -336,14 +336,14 @@ function elementShowAdvanced(elements, show) {
     }
 }
 
-function showAdvancedInit(addBefore, nameAttr, buttonLabel, hideText, showText) {
+function showAdvancedInit(addBefore, nameAttr, buttonLabel) {
     var showHideButton = document.createElement("input");
     showHideButton.type = 'button';
     showHideButton.value = buttonLabel;
     showHideButton.name = nameAttr;
     showHideButton.moodle = {
-        hideLabel: hideText,
-        showLabel: showText
+        hideLabel: mstr.form.hideadvanced,
+        showLabel: mstr.form.showadvanced
     };
     YAHOO.util.Event.addListener(showHideButton, 'click', showAdvancedOnClick);
     el = document.getElementById(addBefore);
@@ -1029,4 +1029,4 @@ function hide_item(itemid) {
     if (item) {
         item.style.display = "none";
     }
-}
\ No newline at end of file
+}