diff --git a/Models/Task.php b/Models/Task.php
index c6537c5..2483db3 100644
--- a/Models/Task.php
+++ b/Models/Task.php
@@ -130,7 +130,8 @@ class Task implements \JsonSerializable
     public function __construct()
     {
         $this->createdAt = new \DateTime('now');
-        $this->due = (new \DateTime('now'))->modify('+1 day');
+        $this->due = new \DateTime('now');
+        $this->due->modify('+1 day');
         $this->schedule = new Schedule();
     }
 
diff --git a/Models/TaskElement.php b/Models/TaskElement.php
index 080c37e..1c0c9f7 100644
--- a/Models/TaskElement.php
+++ b/Models/TaskElement.php
@@ -104,7 +104,8 @@ class TaskElement implements \JsonSerializable
      */
     public function __construct()
     {
-        $this->due       = (new \DateTime('now'))->modify('+1 day');
+        $this->due       = new \DateTime('now');
+        $this->due->modify('+1 day');
         $this->createdAt = new \DateTime('now');
     }
 
diff --git a/Theme/backend/task-single.tpl.php b/Theme/backend/task-single.tpl.php
index 73c5d36..d421a09 100644
--- a/Theme/backend/task-single.tpl.php
+++ b/Theme/backend/task-single.tpl.php
@@ -91,7 +91,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr><td><label for="iMessage"><?= $this->getText('Message'); ?></label>
                         <tr><td><textarea id="iMessage" name="description"></textarea>
                         <tr><td><label for="iDue"><?= $this->getText('Due'); ?></label>
-                        <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= end($elements)->getDue()->format('Y-m-d\TH:i:s'); ?>">
+                        <tr><td><input type="datetime-local" id="iDue" name="due" value="<?= !empty($elements) ? end($elements)->getDue()->format('Y-m-d\TH:i:s') : $task->getDue()->format('Y-m-d\TH:i:s'); ?>">
                         <tr><td><label for="iStatus"><?= $this->getText('Status'); ?></label>
                         <tr><td><select id="iStatus" name="status">
                                     <option value="<?= \Modules\Tasks\Models\TaskStatus::OPEN; ?>" selected>Open