diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 996ed7b..94386d9 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -40,7 +40,7 @@
       plan = answer.plan
       owner = plan.owner
       deliver_if(recipients: owner, key: 'users.new_comment') do |r|
-        UserMailer.new_comment(r, plan).deliver_now()
+        UserMailer.new_comment(current_user, plan).deliver_now()
       end
       @notice = success_message(_('comment'), _('created'))
       render(json: {
diff --git a/app/models/plan.rb b/app/models/plan.rb
index 9ef0a14..431ceac 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -218,7 +218,8 @@
 
         if self.save!
           # Send an email confirmation to the owners and co-owners
-          deliver_if(recipients: self.owner_and_coowners, key: 'users.feedback_requested') do |r|
+          owners = User.joins(:roles).where('roles.plan_id =? AND roles.access IN (?)', self.id, Role.access_values_for(:administrator))
+          deliver_if(recipients: owners, key: 'users.feedback_requested') do |r|
             UserMailer.feedback_confirmation(r, self, user).deliver_now
           end
           # Send an email to all of the org admins as well as the Org's administrator email
@@ -255,8 +256,9 @@
         
         if self.save!
           # Send an email confirmation to the owners and co-owners
-          deliver_if(recipients: self.owner_and_coowners, key: 'users.feedback_provided') do |r|
-            UserMailer.feedback_notification(r, self, org_admin).deliver_now
+          owners = User.joins(:roles).where('roles.plan_id =? AND roles.access IN (?)', self.id, Role.access_values_for(:administrator))
+          deliver_if(recipients: owners, key: 'users.feedback_provided') do |r|
+            UserMailer.feedback_complete(r, self, org_admin).deliver_now
           end
           true
         else
diff --git a/app/views/user_mailer/feedback_complete.html.erb b/app/views/user_mailer/feedback_complete.html.erb
index d86c1df..2d7a663 100644
--- a/app/views/user_mailer/feedback_complete.html.erb
+++ b/app/views/user_mailer/feedback_complete.html.erb
@@ -6,6 +6,6 @@
 %>
 
 <p><%= _('Hello %{recipient_name}') % { recipient_name: recipient_name } %></p>
-<p><%= _('%{commenter} has finished providing feedback on the plan “%{plan_title}”. To view the comments, please visit the My Dashboard page in %{tool_name} and open your plan.') % { commenter: requestor, plan_title: plan_name, tool_name: tool_name } %></p>
+<p><%= _('%{commenter} has finished providing feedback on the plan "%{plan_title}". To view the comments, please visit the My Dashboard page in %{tool_name} and open your plan.') % { commenter: requestor, plan_title: plan_name, tool_name: tool_name } %></p>
 
 <%= render partial: 'email_signature' %>
\ No newline at end of file