diff --git a/lib/form/dateselector.php b/lib/form/dateselector.php
index 574c0c95fb6..aab42ccd417 100644
--- a/lib/form/dateselector.php
+++ b/lib/form/dateselector.php
@@ -83,6 +83,11 @@ class MoodleQuickForm_date_selector extends MoodleQuickForm_group
         if($this->_options['optional']) {
             $this->_elements[] =& MoodleQuickForm::createElement('checkbox', 'off', null, get_string('disable'), $this->getAttributes(), true);
         }
+        foreach ($this->_elements as $element){
+            if (method_exists($element, 'setHiddenLabel')){
+                $element->setHiddenLabel(true);
+            }
+        }
 
     }
 
diff --git a/lib/form/datetimeselector.php b/lib/form/datetimeselector.php
index 5aa7ba108ae..4f3e1968a5e 100644
--- a/lib/form/datetimeselector.php
+++ b/lib/form/datetimeselector.php
@@ -90,6 +90,11 @@ class MoodleQuickForm_date_time_selector extends MoodleQuickForm_group{
         if($this->_options['optional']) {
             $this->_elements[] =& MoodleQuickForm::createElement('checkbox', 'off', null, get_string('disable'), $this->getAttributes(), true);
         }
+        foreach ($this->_elements as $element){
+            if (method_exists($element, 'setHiddenLabel')){
+                $element->setHiddenLabel(true);
+            }
+        }
 
     }
 
diff --git a/lib/form/group.php b/lib/form/group.php
index 88fbbb7e3e1..714bdddca40 100644
--- a/lib/form/group.php
+++ b/lib/form/group.php
@@ -52,5 +52,13 @@ class MoodleQuickForm_group extends HTML_QuickForm_group{
     function getElementTemplateType(){
         return $this->_elementTemplateType;
     }
+    function setElements($elements){
+        parent::setElements($elements);
+        foreach ($this->_elements as $element){
+            if (method_exists($element, 'setHiddenLabel')){
+                $element->setHiddenLabel(true);
+            }
+        }
+    }
 }
 ?>
\ No newline at end of file
diff --git a/lib/form/select.php b/lib/form/select.php
index b86d295bd70..e349211b82f 100644
--- a/lib/form/select.php
+++ b/lib/form/select.php
@@ -14,6 +14,37 @@ class MoodleQuickForm_select extends HTML_QuickForm_select{
      * @var string
      */
     var $_helpbutton='';
+    var $_hiddenLabel=false;
+    function setHiddenLabel($hiddenLabel){
+        $this->_hiddenLabel = $hiddenLabel;
+    }
+    function toHtml(){
+        $this->_generateId();
+        if ($this->_hiddenLabel){
+            return '<label class="accesshide" for="'.$this->getAttribute('id').'" >'.
+                        $this->getLabel().'</label>'.parent::toHtml();
+        } else {
+             return parent::toHtml();
+        }
+    }
+   /**
+    * Automatically generates and assigns an 'id' attribute for the element.
+    *
+    * Currently used to ensure that labels work on radio buttons and
+    * checkboxes. Per idea of Alexander Radivanovich.
+    * Overriden in moodleforms to remove qf_ prefix.
+    *
+    * @access private
+    * @return void
+    */
+    function _generateId()
+    {
+        static $idx = 1;
+
+        if (!$this->getAttribute('id')) {
+            $this->updateAttributes(array('id' => 'id_'. substr(md5(microtime() . $idx++), 0, 6)));
+        }
+    } // end func _generateId
     /**
      * set html for help button
      *
@@ -63,5 +94,6 @@ class MoodleQuickForm_select extends HTML_QuickForm_select{
             }
         }
     } // end func removeOption
+
 }
 ?>
\ No newline at end of file
diff --git a/lib/form/text.php b/lib/form/text.php
index b83ee767f7d..cae359cfa88 100644
--- a/lib/form/text.php
+++ b/lib/form/text.php
@@ -14,6 +14,37 @@ class MoodleQuickForm_text extends HTML_QuickForm_text{
      * @var string
      */
     var $_helpbutton='';
+    var $_hiddenLabel=false;
+    function setHiddenLabel($hiddenLabel){
+        $this->_hiddenLabel = $hiddenLabel;
+    }
+    function toHtml(){
+        $this->_generateId();
+        if ($this->_hiddenLabel){
+            return '<label class="accesshide" for="'.$this->getAttribute('id').'" >'.
+                        $this->getLabel().'</label>'.parent::toHtml();
+        } else {
+             return parent::toHtml();
+        }
+    }
+   /**
+    * Automatically generates and assigns an 'id' attribute for the element.
+    *
+    * Currently used to ensure that labels work on radio buttons and
+    * checkboxes. Per idea of Alexander Radivanovich.
+    * Overriden in moodleforms to remove qf_ prefix.
+    *
+    * @access private
+    * @return void
+    */
+    function _generateId()
+    {
+        static $idx = 1;
+
+        if (!$this->getAttribute('id')) {
+            $this->updateAttributes(array('id' => 'id_'. substr(md5(microtime() . $idx++), 0, 6)));
+        }
+    } // end func _generateId
     /**
      * set html for help button
      *
diff --git a/lib/formslib.php b/lib/formslib.php
index 838838e91ff..a772712414f 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -89,7 +89,8 @@ class moodleform {
      * @return moodleform
      */
     function moodleform($action, $customdata=null, $method='post', $target='', $attributes=null) {
-        $this->_formname = rtrim(get_class($this), '_form');
+        //strip '_form' from the end of class name to make form 'id' attribute.
+        $this->_formname = preg_replace('/_form$/', '', get_class($this), 1);
         $this->_customdata = $customdata;
         $this->_form =& new MoodleQuickForm($this->_formname, $method, $action, $target, $attributes);
 
@@ -1038,7 +1039,10 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         } else {
             $id = $element->getName();
         }
-        $element->updateAttributes(array('id'=>'id_'.$id));
+        $id = preg_replace('/^qf_/', '', $id, 1);
+        if (strpos($id, 'id_') !== 0){
+            $element->updateAttributes(array('id'=>'id_'.$id));
+        }
         parent::renderElement($element, $required, $error);
     }
     function finishForm(&$form){
diff --git a/mod/data/mod_form.php b/mod/data/mod_form.php
index 3e9192d8337..eda4b9cde4b 100644
--- a/mod/data/mod_form.php
+++ b/mod/data/mod_form.php
@@ -18,7 +18,7 @@ class data_mod_form extends moodleform_mod {
 
 		$mform->addElement('htmleditor', 'intro', get_string('intro', 'data'));
 		$mform->setType('intro', PARAM_RAW);
-		$mform->addRule('intro', get_string('required'), 'required', null, 'client');
+		$mform->addRule('intro', null, 'required', null, 'client');
 
         $mform->addElement('date_selector', 'timeavailablefrom', get_string('availablefromdate', 'data'), array('optional'=>true));