diff --git a/app/views/forum_topics/new.html.erb b/app/views/forum_topics/new.html.erb
index 4bda4dab5..82c98c2e9 100644
--- a/app/views/forum_topics/new.html.erb
+++ b/app/views/forum_topics/new.html.erb
@@ -2,7 +2,7 @@
   <div id="a-new">
     <h1>New Forum Topic</h1>
 
-    <%= render "form" %>
+    <%= render "form", :forum_topic => @forum_topic %>
   </div>
 </div>
 
diff --git a/test/functional/forum_topics_controller_test.rb b/test/functional/forum_topics_controller_test.rb
index 964156ce9..d0bd93b15 100644
--- a/test/functional/forum_topics_controller_test.rb
+++ b/test/functional/forum_topics_controller_test.rb
@@ -8,7 +8,7 @@ class ForumTopicsControllerTest < ActionController::TestCase
       CurrentUser.ip_addr = "127.0.0.1"
       @other_user = FactoryGirl.create(:user)
       @mod = FactoryGirl.create(:moderator_user)
-      @forum_topic = FactoryGirl.create(:forum_topic, :title => "my forum topic", :creator => @user)
+      @forum_topic = FactoryGirl.create(:forum_topic, :title => "my forum topic", :creator => @user, :original_post_attributes => {:body => "xxx"})
     end
 
     teardown do