diff --git a/proposal_template.typ b/proposal_template.typ
index 6018c3c..c91b84e 100644
--- a/proposal_template.typ
+++ b/proposal_template.typ
@@ -9,8 +9,8 @@
   supervisor: "",
   advisors: (),
   author: "",
-  startDate: none,
-  submissionDate: none,
+  startDate: datetime,
+  submissionDate: datetime,
   body,
 ) = {
   // Set the document's basic properties.
diff --git a/thesis_template.typ b/thesis_template.typ
index 98c61a6..95eaeac 100644
--- a/thesis_template.typ
+++ b/thesis_template.typ
@@ -6,8 +6,8 @@
   supervisor: "",
   advisors: (),
   author: "",
-  startDate: none,
-  submissionDate: none,
+  startDate: datetime,
+  submissionDate: datetime,
   body,
 ) = {
   set page(
diff --git a/thesis_typ/disclaimer.typ b/thesis_typ/disclaimer.typ
index b848986..c28ced7 100644
--- a/thesis_typ/disclaimer.typ
+++ b/thesis_typ/disclaimer.typ
@@ -32,7 +32,7 @@
   grid(
       columns: 2,
       gutter: 1fr,
-      "Munich, " + submissionDate, author
+      "Munich, " + submissionDate.display("[day].[month].[year]"), author
   )
 
   pagebreak()