1 files changed, 1 insertions, 3 deletions
diff --git a/libs/HTML/QuickForm2/Element/InputCheckable.php b/libs/HTML/QuickForm2/Element/InputCheckable.php
index 9a152ec7c3..82332b4cb1 100644
--- a/libs/HTML/QuickForm2/Element/InputCheckable.php
+++ b/libs/HTML/QuickForm2/Element/InputCheckable.php
@@ -153,9 +153,7 @@ class HTML_QuickForm2_Element_InputCheckable extends HTML_QuickForm2_Element_Inp
         } elseif ($this->frozen) {
             $label = $this->data['content'];
         } else {
-            $label = '<label for="' . htmlspecialchars(
-                         $this->getId(), ENT_QUOTES, self::getOption('charset')
-                     ) . '">' . $this->data['content'] . '</label>';
+            return '<label>' . parent::__toString() . '<span>' . $this->data['content'] . '</span></label>';
         }
         return parent::__toString() . $label;
     }