diff --git a/flextype/core/Forms.php b/flextype/core/Forms.php
index fdc17a92..69761fc7 100644
--- a/flextype/core/Forms.php
+++ b/flextype/core/Forms.php
@@ -158,7 +158,7 @@ class Forms
                         case 'tags':
                             $form_element = $this->tagsField($element_name, $form_value, $property);
                             break;
-                        case 'date':
+                        case 'datetimepicker':
                             $form_element = $this->dateField($element_name, $form_value, $property);
                             break;
                         // Simple text-input, for single-line fields.
diff --git a/site/fieldsets/blog-post.yaml b/site/fieldsets/blog-post.yaml
index b48e6fdc..4e501d59 100644
--- a/site/fieldsets/blog-post.yaml
+++ b/site/fieldsets/blog-post.yaml
@@ -20,9 +20,9 @@ sections:
         title: admin_tags
         type: tags
         size: 8/12
-      date:
-        title: admin_date
-        type: date
+      published_at:
+        title: admin_published_at
+        type: datetimepicker
         size: 4/12
   seo:
     title: Seo