diff --git a/package.json b/package.json
index d0edb8bb70..29db6dc479 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "vue-router": "^2.0.0-rc.5",
     "vue-style-loader": "^3.0.0",
     "vue-template-compiler": "^2.1.10",
-    "vuejs-datepicker": "^0.9.4",
+    "vuejs-datepicker": "habitrpg/vuejs-datepicker#v0.9.12",
     "webpack": "^2.2.1",
     "webpack-merge": "^4.0.0",
     "winston": "^2.1.0",
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 6de6dcceab..9533a8c37b 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -69,10 +69,24 @@
               .option-item-label(v-once) {{ $t('hard') }}
         .option(v-if="task.type === 'todo'")
           label(v-once) {{ $t('dueDate') }}
-          datepicker(v-model="task.date")
+          datepicker(
+            v-model="task.date",
+            :clearButton='true',
+            clearButtonIcon='category-select',
+            :clearButtonText='$t("clear")',
+            :todayButton='true',
+            todayButtonIcon='category-select',
+            :todayButtonText='$t("today")',
+          )
         .option(v-if="task.type === 'daily'")
           label(v-once) {{ $t('startDate') }}
-          datepicker(v-model="task.startDate")
+          datepicker(
+            v-model="task.startDate",
+            :clearButton='false',
+            :todayButton='true',
+            todayButtonIcon='category-select',
+            :todayButtonText='$t("today")',
+          )
         .option(v-if="task.type === 'daily'")
           .form-group
             label(v-once) {{ $t('repeats') }}