diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index ffa928d1..3cfc95c9 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -45,7 +45,7 @@ class UserMailer < ApplicationMailer
   end
 
   def send_thank_you_note(request_for_comment, receiver)
-    token = AuthenticationToken.generate!(request_for_comment.user)
+    token = AuthenticationToken.generate!(receiver)
     @receiver_displayname = receiver.displayname
     @author = request_for_comment.user.displayname
     @thank_you_note = request_for_comment.thank_you_note
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 1bd68eb3..7f5ae70b 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -132,9 +132,9 @@ describe UserMailer do
 
   describe '#send_thank_you_note' do
     let(:user) { create(:learner) }
-    let(:token) { AuthenticationToken.find_by(user: user) }
+    let(:receiver) { create(:teacher) }
+    let(:token) { AuthenticationToken.find_by(user: receiver) }
     let(:request_for_comments) { create(:rfc_with_comment, user: user) }
-    let(:receiver) { InternalUser.create(attributes_for(:teacher)) }
     let(:mail) { described_class.send_thank_you_note(request_for_comments, receiver).deliver_now }
 
     it 'sets the correct sender' do