diff --git a/lib/yform/value/datetime.php b/lib/yform/value/datetime.php
index 2e868651..dd519e7f 100644
--- a/lib/yform/value/datetime.php
+++ b/lib/yform/value/datetime.php
@@ -15,6 +15,7 @@ class rex_yform_value_datetime extends rex_yform_value_abstract
     public function preValidateAction(): void
     {
         $value = $this->getValue();
+
         if ('' == $this->getValue() && $this->params['main_id'] < 1) {
             if (1 == $this->getElement('current_date')) {
                 $value = date(rex_sql::FORMAT_DATETIME);
@@ -36,7 +37,11 @@ public function preValidateAction(): void
             $second = (int) ($value['second'] ?? 0);
         } else {
             $value = (string) $value;
-            $value = explode(' ', $value);
+            $localTimeTest = explode(' ', $value);
+            if (2 != count($localTimeTest)) {
+                $localTimeTest = explode('T', $value);
+            }
+            $value = $localTimeTest;
             if (2 == count($value)) {
                 $date = explode('-', (string) $value[0]);
                 $year = (int) ($date[0] ?? 0);
@@ -64,7 +69,11 @@ public function enterObject()
             $second = (int) ($value['second'] ?? 0);
         } else {
             $value = (string) $value;
-            $value = explode(' ', $value);
+            $localTimeTest = explode(' ', $value);
+            if (2 != count($localTimeTest)) {
+                $localTimeTest = explode('T', $value);
+            }
+            $value = $localTimeTest;
             if (2 == count($value)) {
                 $date = explode('-', (string) $value[0]);
                 $year = (int) ($date[0] ?? 0);
@@ -182,7 +191,8 @@ public static function getSearchField($params)
             'name' => $params['field']->getName(),
             'label' => $params['field']->getLabel(),
             'notice' => rex_i18n::msg('yform_values_date_search_notice', $format),
-            'attributes' => '{"data-yform-tools-datetimerangepicker":"' . $format . '"}', ]);
+            'attributes' => '{"data-yform-tools-datetimerangepicker":"' . $format . '"}',
+        ]);
     }
 
     public static function getSearchFilter($params)