diff --git a/lib/completion/completion_criteria_date.php b/lib/completion/completion_criteria_date.php
index 9bd66a2..d17f411 100644
--- a/lib/completion/completion_criteria_date.php
+++ b/lib/completion/completion_criteria_date.php
@@ -53,7 +53,7 @@ class completion_criteria_date extends completion_criteria {
     public function config_form_display(&$mform, $data = null)
     {
         $mform->addElement('checkbox', 'criteria_date', get_string('enable'));
-        $mform->addElement('date', 'criteria_date_value', get_string('afterspecifieddate', 'completion'));
+        $mform->addElement('date_selector', 'criteria_date_value', get_string('afterspecifieddate', 'completion'));
 
         // If instance of criteria exists
         if ($this->id) {
@@ -75,7 +75,7 @@ class completion_criteria_date extends completion_criteria {
         if (!empty($data->criteria_date)) {
             $this->course = $data->id;
             $date = $data->criteria_date_value;
-            $this->timeend = strtotime($date['Y'].'-'.$date['M'].'-'.$date['d']);
+            $this->timeend = $date;
             $this->insert();
         }
     }