diff --git a/classes/plugin/Admin.php b/classes/plugin/Admin.php
index d6c908e1..047d6eb3 100644
--- a/classes/plugin/Admin.php
+++ b/classes/plugin/Admin.php
@@ -1318,22 +1318,21 @@ class Admin
         ];
 
         if (!isset($guess[$date])) {
+            $guess[$date] = 'd-m-Y H:i';
             foreach ($date_formats as $date_format) {
                 foreach ($time_formats as $time_format) {
-                    if ($this->validateDate($date, "$date_format $time_format")) {
-                        $guess[$date] = "$date_format $time_format";
+                    $full_format = "{$date_format} {$time_format}";
+                    if ($this->validateDate($date, $full_format)) {
+                        $guess[$date] = $full_format;
                         break 2;
                     }
-                    if ($this->validateDate($date, "$time_format $date_format")) {
-                        $guess[$date] = "$time_format $date_format";
+                    $full_format = "{$time_format} {$date_format}";
+                    if ($this->validateDate($date, $full_format)) {
+                        $guess[$date] = $full_format;
                         break 2;
                     }
                 }
             }
-
-            if (!isset($guess[$date])) {
-                $guess[$date] = 'd-m-Y H:i';
-            }
         }
 
         return $guess[$date];
diff --git a/themes/grav/templates/forms/fields/datetime/datetime.html.twig b/themes/grav/templates/forms/fields/datetime/datetime.html.twig
index a8d27be7..c1e00229 100644
--- a/themes/grav/templates/forms/fields/datetime/datetime.html.twig
+++ b/themes/grav/templates/forms/fields/datetime/datetime.html.twig
@@ -2,7 +2,7 @@
 
 {% set value = (value is null ? field.default : value) %}
 {% set default_php_dateformat = admin.guessDateFormat(value) %}
-{% set php_dateformat = field.format ?: admin.page.dateformat ?: config.system.pages.dateformat.default ?: default_php_dateformat %}
+{% set php_dateformat = field.format ?: (form ? form.object.dateformat : admin.page.dateformat) ?: config.system.pages.dateformat.default ?: default_php_dateformat %}
 {% set js_dateformat = admin.dateformatToMomentJS(php_dateformat) %}
 {% set value = (value is null ? value : value|date(php_dateformat)) %}