diff --git a/main/inc/lib/pear/HTML/QuickForm/checkbox.php b/main/inc/lib/pear/HTML/QuickForm/checkbox.php
index 25f9255439..1e4b2232a5 100755
--- a/main/inc/lib/pear/HTML/QuickForm/checkbox.php
+++ b/main/inc/lib/pear/HTML/QuickForm/checkbox.php
@@ -134,9 +134,13 @@ class HTML_QuickForm_checkbox extends HTML_QuickForm_input
         } elseif ($this->_flagFrozen) {
             $label = $this->_text;
         } else {
-            $label = '<label class="checkbox '.$this->getAttribute('label-class').' ">' .
-                HTML_QuickForm_input::toHtml().$this->_text
-                . '</label>';
+            $label =
+                '<div class="checkbox">
+                <label '.$this->getAttribute('label-class').' ">' .
+                    HTML_QuickForm_input::toHtml().$this->_text.
+                '</label>
+                </div>
+                ';
 
             return $label;
         }