diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index d84a9ea5..0671bb2d 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -86,17 +86,21 @@
             </div>
           </div>
           <div v-else-if="currentField.type === 'date'">
-            <label
-              v-if="currentField.name"
-              :for="currentField.uuid"
-              class="label text-2xl mb-2"
-            >{{ currentField.name }}
-              <template v-if="!currentField.required">({{ t('optional') }})</template>
-            </label>
-            <div
-              v-else
-              class="py-1"
-            />
+            <div class="flex justify-between items-center w-full mb-2">
+              <label
+                :for="currentField.uuid"
+                class="label text-2xl"
+              >{{ currentField.name || t('date') }}
+                <template v-if="!currentField.required">({{ t('optional') }})</template>
+              </label>
+              <button
+                class="btn btn-outline btn-sm !normal-case font-normal"
+                @click.prevent="setCurrentDate"
+              >
+                <IconCalendarCheck :width="16" />
+                {{ t('set_today') }}
+              </button>
+            </div>
             <div class="text-center">
               <input
                 :id="currentField.uuid"
@@ -360,7 +364,7 @@ import AttachmentStep from './attachment_step'
 import MultiSelectStep from './multi_select_step'
 import PhoneStep from './phone_step'
 import FormCompleted from './completed'
-import { IconInnerShadowTop, IconArrowsDiagonal, IconArrowsDiagonalMinimize2 } from '@tabler/icons-vue'
+import { IconInnerShadowTop, IconArrowsDiagonal, IconArrowsDiagonalMinimize2, IconCalendarCheck } from '@tabler/icons-vue'
 import { t } from './i18n'
 
 export default {
@@ -375,6 +379,7 @@ export default {
     IconInnerShadowTop,
     IconArrowsDiagonal,
     PhoneStep,
+    IconCalendarCheck,
     IconArrowsDiagonalMinimize2,
     FormCompleted
   },
@@ -643,6 +648,13 @@ export default {
         }
       })
     },
+    setCurrentDate () {
+      const inputEl = document.getElementById(this.currentField.uuid)
+
+      inputEl.valueAsDate = new Date()
+
+      inputEl.dispatchEvent(new Event('input', { bubbles: true }))
+    },
     saveStep (formData) {
       if (this.isCompleted) {
         return Promise.resolve({})
diff --git a/app/javascript/submission_form/i18n.js b/app/javascript/submission_form/i18n.js
index 3db20ffd..fec800ab 100644
--- a/app/javascript/submission_form/i18n.js
+++ b/app/javascript/submission_form/i18n.js
@@ -30,6 +30,8 @@ const en = {
   resend_code: 'Re-send code',
   verification_code_has_been_resent: 'Verification code has been re-sent via SMS',
   please_fill_all_required_fields: 'Please fill all required fields',
+  set_today: 'Set Today',
+  date: 'Date',
   email_has_been_sent: 'Email has been sent'
 }
 
@@ -65,6 +67,8 @@ const es = {
   resend_code: 'Reenviar código',
   verification_code_has_been_resent: 'El código de verificación ha sido reenviado por SMS',
   please_fill_all_required_fields: 'Por favor, complete todos los campos obligatorios',
+  set_today: 'Establecer Hoy',
+  date: 'Fecha',
   email_has_been_sent: 'El correo electrónico ha sido enviado'
 }
 
@@ -100,6 +104,8 @@ const it = {
   resend_code: 'Rinvia codice',
   verification_code_has_been_resent: 'Il codice di verifica è stato rinviato tramite SMS',
   please_fill_all_required_fields: 'Si prega di compilare tutti i campi obbligatori',
+  set_today: 'Imposta Oggi',
+  date: 'Data',
   email_has_been_sent: "L'email è stata inviata"
 }
 
@@ -135,6 +141,8 @@ const de = {
   resend_code: 'Code erneut senden',
   verification_code_has_been_resent: 'Die Verifizierungscode wurde erneut per SMS gesendet',
   please_fill_all_required_fields: 'Bitte füllen Sie alle erforderlichen Felder aus',
+  set_today: 'Heute einstellen',
+  date: 'Datum',
   email_has_been_sent: 'Die E-Mail wurde gesendet'
 }
 
@@ -170,6 +178,8 @@ const fr = {
   resend_code: 'Renvoyer le code',
   verification_code_has_been_resent: 'Le code de vérification a été renvoyé par SMS',
   please_fill_all_required_fields: 'Veuillez remplir tous les champs obligatoires',
+  set_today: "Définir Aujourd'hui",
+  date: 'Date',
   email_has_been_sent: "L'email a été envoyé"
 }
 
@@ -205,6 +215,8 @@ const pl = {
   resend_code: 'Ponownie wyślij kod',
   verification_code_has_been_resent: 'Kod weryfikacyjny został ponownie wysłany',
   please_fill_all_required_fields: 'Proszę wypełnić wszystkie wymagane pola',
+  set_today: 'Ustaw Dziś',
+  date: 'Data',
   email_has_been_sent: 'E-mail został wysłany'
 }
 
@@ -240,6 +252,8 @@ const uk = {
   resend_code: 'Повторно відправити код',
   verification_code_has_been_resent: 'Код підтвердження був повторно надісланий',
   please_fill_all_required_fields: "Будь ласка, заповніть всі обов'язкові поля",
+  set_today: 'Задати Сьогодні',
+  date: 'Дата',
   email_has_been_sent: 'Електронний лист був відправлений'
 }
 
@@ -275,6 +289,8 @@ const cs = {
   resend_code: 'Znovu odeslat kód',
   verification_code_has_been_resent: 'Ověřovací kód byl znovu odeslán',
   please_fill_all_required_fields: 'Prosím vyplňte všechny povinné položky',
+  set_today: 'Nastavit Dnes',
+  date: 'Datum',
   email_has_been_sent: 'E-mail byl odeslán'
 }
 
@@ -310,6 +326,8 @@ const pt = {
   resend_code: 'Reenviar código',
   verification_code_has_been_resent: 'O código de verificação foi reenviado via SMS',
   please_fill_all_required_fields: 'Por favor, preencha todos os campos obrigatórios',
+  set_today: 'Definir Hoje',
+  date: 'Data',
   email_has_been_sent: 'Email enviado'
 }