diff --git a/lib/formslib.php b/lib/formslib.php
index 03bb5f0..68532a3 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -2348,6 +2348,15 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
             $html = str_replace('{help}', '', $html);
 
         }
+        if (!is_null($element->getAttribute('id'))) {
+            $id = $element->getAttribute('id');
+        } else {
+            $id = $element->getName();
+        }
+        // Adding for attribute to label for increased accessiblity MDL-30907
+        if (!empty($id) && ($element->getType() === 'date_time_selector' || $element->getType() === 'date_selector')) {
+            $html = str_replace('<label', '<label for="fitem_' . $id . '"', $html);
+        }
         if (($this->_inGroup) and !empty($this->_groupElementTemplate)) {
             $this->_groupElementTemplate = $html;
         }