diff --git a/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue b/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue
index 65aabb2596..230f1733dc 100644
--- a/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue
+++ b/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue
@@ -27,6 +27,8 @@ import ParameterLocation from './controls/parameter-location.vue'
 import ParameterCronExpression from './controls/parameter-cronexpression.vue'
 import ParameterDayOfWeek from './controls/parameter-dayofweek.vue'
 import ParameterTime from './controls/parameter-time.vue'
+import ParameterDate from '@/components/config/controls/parameter-date.vue'
+import ParameterDatetime from '@/components/config/controls/parameter-datetime.vue'
 import ParameterPageWidget from './controls/parameter-pagewidget.vue'
 import ParameterRule from './controls/parameter-rule.vue'
 import ParameterPersistenceService from './controls/parameter-persistenceservice.vue'
@@ -74,6 +76,10 @@ export default {
         return ParameterDayOfWeek
       } else if (configDescription.type === 'TEXT' && configDescription.context === 'time') {
         return ParameterTime
+      } else if (configDescription.type === 'TEXT' && configDescription.context === 'date') {
+        return ParameterDate
+      } else if (configDescription.type === 'TEXT' && configDescription.context === 'datetime') {
+        return ParameterDatetime
       } else if (configDescription.type === 'TEXT' && configDescription.context && configDescription.context.indexOf('page') >= 0) {
         return ParameterPageWidget
       } else if (configDescription.type === 'TEXT' && configDescription.context && configDescription.context.indexOf('widget') >= 0) {
diff --git a/bundles/org.openhab.ui/web/src/components/config/controls/parameter-date.vue b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-date.vue
new file mode 100644
index 0000000000..a6609514d0
--- /dev/null
+++ b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-date.vue
@@ -0,0 +1,24 @@
+<template>
+  <ul>
+    <f7-list-input
+      ref="input"
+      type="date"
+      :floating-label="$theme.md"
+      :label="configDescription.label"
+      :name="configDescription.name"
+      :value="value"
+      :required="configDescription.required" validate
+      @input="updateValue" />
+  </ul>
+</template>
+
+<script>
+export default {
+  props: ['configDescription', 'value'],
+  methods: {
+    updateValue (event) {
+      this.$emit('input', event.target.value)
+    }
+  }
+}
+</script>
diff --git a/bundles/org.openhab.ui/web/src/components/config/controls/parameter-datetime.vue b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-datetime.vue
new file mode 100644
index 0000000000..d84896afcb
--- /dev/null
+++ b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-datetime.vue
@@ -0,0 +1,31 @@
+<template>
+  <ul>
+    <f7-list-input
+      class="parameter-datetime"
+      ref="input"
+      type="datetime-local"
+      :floating-label="$theme.md"
+      :label="configDescription.label"
+      :name="configDescription.name"
+      :value="value"
+      :required="configDescription.required" validate
+      @input="updateValue" />
+  </ul>
+</template>
+
+<style lang="stylus">
+.parameter-datetime
+  input[type="datetime-local"]
+    max-width 100% !important
+</style>
+
+<script>
+export default {
+  props: ['configDescription', 'value'],
+  methods: {
+    updateValue (event) {
+      this.$emit('input', event.target.value)
+    }
+  }
+}
+</script>