diff --git a/app/views/cms/_text_fields.html.erb b/app/views/cms/_text_fields.html.erb
index b42a8ac..96bb370 100644
--- a/app/views/cms/_text_fields.html.erb
+++ b/app/views/cms/_text_fields.html.erb
@@ -1 +1 @@
-<%= labelled_form_field(_('Publish date'), date_field('article[published_at]', DateTime.current, '%Y-%m-%d', {:max_date => '+0d', :date_format => 'yy-mm-dd'}, {:id => "article_published_at"})) %>
+<%= labelled_form_field(_('Publish date'), date_field('article[published_at]', @article.published_at || DateTime.current, '%Y-%m-%d', {:max_date => '+0d', :date_format => 'yy-mm-dd'}, {:id => "article_published_at"})) %>
--
libgit2 0.21.2