diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index b0f3465..f967326 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -359,7 +359,7 @@
 
     begin
       @exported_plan.save!
-      file_name = @plan.title.gsub(/ /, "_")
+      file_name = @exported_plan.settings(:export)[:value]['title'].gsub(/ /, "_")
 
       respond_to do |format|
         format.html
diff --git a/app/views/plans/export.docx.erb b/app/views/plans/export.docx.erb
index 7f9c2c2..be267a8 100644
--- a/app/views/plans/export.docx.erb
+++ b/app/views/plans/export.docx.erb
@@ -1,4 +1,4 @@
-<h1><%= @exported_plan.title %></h1>
+<h1><%= @plan.title %></h1>
 <h2><%= @plan.template.title %></h2>
 
 <% details = @exported_plan.admin_details %>