diff --git a/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php b/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
index 48025ed2f2..2662600602 100644
--- a/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
+++ b/main/inc/lib/pear/HTML/QuickForm/Renderer/Default.php
@@ -251,10 +251,10 @@ class HTML_QuickForm_Renderer_Default extends HTML_QuickForm_Renderer
         
         if (isset($this->_templates[$name])) {
             $html = str_replace('{label}', $nameLabel, $this->_templates[$name]);
-            $html = str_replace('{label-for}', $labelFor, $this->_templates[$name]);
+            $html = str_replace('{label-for}', $labelFor, $html);
         } else {
             $html = str_replace('{label}', $nameLabel, $this->_elementTemplate);
-            $html = str_replace('{label-for}', $labelFor, $this->_elementTemplate);
+            $html = str_replace('{label-for}', $labelFor, $html);
         }
         if ($required) {
             $html = str_replace('<!-- BEGIN required -->', '', $html);