diff --git a/app/models/article.rb b/app/models/article.rb
index 199791e..9d32bcb 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -34,7 +34,7 @@ class Article < ActiveRecord::Base
   before_destroy :rotate_translations
 
   before_create do |article|
-    article.published_at = article.created_at if article.published_at.nil?
+    article.published_at ||= Time.now
     if article.reference_article && !article.parent
       parent = article.reference_article.parent
       if parent && parent.blog? && article.profile.has_blog?
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index e91cc94..e881036 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -707,9 +707,11 @@ class ArticleTest < ActiveSupport::TestCase
     assert_respond_to Article.new, :published_at
   end
 
-  should 'published_at is same as created_at if not set' do
-    a = fast_create(Article, :name => 'Published at', :profile_id => profile.id)
-    assert_equal a.created_at, a.published_at
+  should 'fill published_at with current date if not set' do
+    now = Time.now
+    Time.stubs(:now).returns(now)
+    a = create(Article, :name => 'Published at', :profile_id => profile.id)
+    assert_equal now, a.published_at
   end
 
   should 'use npage to compose cache key' do
--
libgit2 0.21.2