diff --git a/app/controllers/my_profile/email_templates_controller.rb b/app/controllers/my_profile/email_templates_controller.rb
index cf607e4..e15e4b6 100644
--- a/app/controllers/my_profile/email_templates_controller.rb
+++ b/app/controllers/my_profile/email_templates_controller.rb
@@ -15,7 +15,6 @@ class EmailTemplatesController < ApplicationController
 
   def show_parsed
     @email_template = owner.email_templates.find(params[:id])
-    template_params = {:profile => owner, :environment => environment}
     render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
   end
 
diff --git a/test/functional/profile_email_templates_controller_test.rb b/test/functional/profile_email_templates_controller_test.rb
index be6e22b..7e345a5 100644
--- a/test/functional/profile_email_templates_controller_test.rb
+++ b/test/functional/profile_email_templates_controller_test.rb
@@ -55,14 +55,14 @@ class ProfileEmailTemplatesControllerTest < ActionController::TestCase
 
   test "should get parsed template" do
     environment = Environment.default
-    @email_template.subject = '{{profile.name}} - {{profile.identifier}}'
-    @email_template.body = '{{profile.name}} - {{profile.identifier}} - {{environment.name}}'
+    @email_template.subject = '{{profile_name}} - {{environment_name}}'
+    @email_template.body = '{{profile_name}} - {{environment_name}}'
     @email_template.save!
     get :show_parsed, id: @email_template, :profile => profile.identifier
     assert_response :success
     json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal "#{profile.name} - #{profile.identifier}", json_response['parsed_subject']
-    assert_equal "#{profile.name} - #{profile.identifier} - #{environment.name}", json_response['parsed_body']
+    assert_equal "#{@person.name} - #{environment.name}", json_response['parsed_subject']
+    assert_equal "#{@person.name} - #{environment.name}", json_response['parsed_body']
   end
 
 end
--
libgit2 0.21.2