diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index 78861306..e7717669 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -205,8 +205,8 @@ class EntriesController extends Controller
                 $data_from_post['title']        = $data['title'];
                 $data_from_post['template']     = $template;
                 $data_from_post['fieldset']     = $data['fieldset'];
-                $data_from_post['published_at'] = time();
-                $data_from_post['created_at']   = time();
+                $data_from_post['published_at'] = date($this->registry->get('settings.date_format'), time());
+                $data_from_post['created_at']   = date($this->registry->get('settings.date_format'), time());
                 $data_from_post['uuid']         = Uuid::uuid4()->toString();
                 $data_from_post['published_by'] = Session::get('uuid');
                 $data_from_post['created_by']   = Session::get('uuid');
diff --git a/site/plugins/admin/views/partials/datetimepicker.html b/site/plugins/admin/views/partials/datetimepicker.html
index 971e2fbf..6b21101b 100644
--- a/site/plugins/admin/views/partials/datetimepicker.html
+++ b/site/plugins/admin/views/partials/datetimepicker.html
@@ -4,7 +4,8 @@
 <script type="text/javascript">
     $(function () {
         $("#datetimepicker").datetimepicker({
-            defaultDate: "{{ entry.published_at|date(settings.date_format) }}",
+            defaultDate: "{{ entry.published_at|date(registry.settings.date_format) }}",
+            format: 'MMMM DD YYYY, hh:mm:ss',
             locale: "{{ locale }}",
             debug: false,
             icons: {