diff --git a/lib/pear/HTML/QuickForm/Renderer/Tableless.php b/lib/pear/HTML/QuickForm/Renderer/Tableless.php
index fb5196f..e09ce6d 100644
--- a/lib/pear/HTML/QuickForm/Renderer/Tableless.php
+++ b/lib/pear/HTML/QuickForm/Renderer/Tableless.php
@@ -195,7 +195,12 @@ class HTML_QuickForm_Renderer_Tableless extends HTML_QuickForm_Renderer_Default
             }
             $this->_html .= str_replace('{element}', $element_html, $html);
         } elseif (!empty($this->_groupElementTemplate)) {
-            $html = str_replace('{label}', $element->getLabel(), $this->_groupElementTemplate);
+            $template = $this->_groupElementTemplate;
+            // allow it to be overridden with an element template.
+            if (isset($this->_templates[$element->getName()])) {
+                $template = $this->_templates[$element->getName()];
+            }
+            $html = str_replace('{label}', $element->getLabel(), $template);
             if ($required) {
                 $html = str_replace('<!-- BEGIN required -->', '', $html);
                 $html = str_replace('<!-- END required -->', '', $html);