diff --git a/lib/form/advcheckbox.php b/lib/form/advcheckbox.php
index 43cd2d3a683..63f46357fd4 100644
--- a/lib/form/advcheckbox.php
+++ b/lib/form/advcheckbox.php
@@ -102,5 +102,9 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox{
             return 'default';
         }
     }
+    function toHtml()
+    {
+        return '<span>' . parent::toHtml() . '</span>';
+    }
 }
 ?>
\ No newline at end of file
diff --git a/lib/form/checkbox.php b/lib/form/checkbox.php
index 294cd322846..2f4442645b1 100644
--- a/lib/form/checkbox.php
+++ b/lib/form/checkbox.php
@@ -99,6 +99,10 @@ class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox{
         }
         return true;
     } // end func onQuickFormEvent
+    function toHtml()
+    {
+        return '<span>' . parent::toHtml() . '</span>';
+    }
     /**
      * Slightly different container template when frozen. Don't want to use a label tag
      * with a for attribute in that case for the element label but instead use a div.
diff --git a/lib/form/radio.php b/lib/form/radio.php
index 7b2ce8ebf6b..cdd3fabbdaf 100644
--- a/lib/form/radio.php
+++ b/lib/form/radio.php
@@ -74,5 +74,9 @@ class MoodleQuickForm_radio extends HTML_QuickForm_radio{
             return 'default';
         }
     }
+    function toHtml()
+    {
+        return '<span>' . parent::toHtml() . '</span>';
+    }
 }
 ?>
\ No newline at end of file