diff --git a/reviewboard/notifications/tests/test_email_sending.py b/reviewboard/notifications/tests/test_email_sending.py
index 1a4584de28e9ddba2ec47661d12c1191b064f67b..3a1e5c49b563aa2069a4bf0d2948d57b89b9d205 100644
--- a/reviewboard/notifications/tests/test_email_sending.py
+++ b/reviewboard/notifications/tests/test_email_sending.py
@@ -711,6 +711,37 @@ class ReviewRequestEmailTests(ReviewRequestEmailTestsMixin, DmarcDnsTestsMixin,
             self.assertTrue('This change has been marked as submitted'
                             in message.as_string())
 
+    def test_review_request_closed_by_other_user_with_email(self):
+        """Testing e-mail is generated when a review request is closed by user
+        (or admin) other than the review request submitter and e-mail setting
+        is True
+        """
+        with self.siteconfig_settings({'mail_send_review_close_mail': True},
+                                      reload_settings=False):
+            review_request = self.create_review_request(publish=True)
+
+            # Clear the outbox.
+            mail.outbox = []
+
+            admin_user = User.objects.get(username='admin')
+            admin_email = build_email_address_for_user(admin_user)
+
+            review_request.close(ReviewRequest.SUBMITTED,
+                                 admin_user)
+
+            self.assertEqual(len(mail.outbox), 1)
+            self.assertEqual(mail.outbox[0].from_email, self.sender)
+            self.assertEqual(mail.outbox[0].extra_headers['From'], admin_email)
+
+            message = mail.outbox[0].message()
+
+            admin_user_full_name = admin_user.get_full_name()
+
+            self.assertIn('This change has been marked as submitted',
+                          message.as_string())
+            self.assertIn('Thanks,\n\n%s' % admin_user_full_name,
+                          message.as_string())
+
     def test_review_request_close_with_email_and_dmarc_deny(self):
         """Tests e-mail is generated when a review request is closed and
         e-mail setting is True and From spoofing blocked by DMARC
diff --git a/reviewboard/templates/notifications/review_request_email.txt b/reviewboard/templates/notifications/review_request_email.txt
index 6c6c858a28111353c3fe40250e8f2f8f41b803ac..4102cd0d32c3fb44ee26c3d9bb0bf40a25234b9b 100644
--- a/reviewboard/templates/notifications/review_request_email.txt
+++ b/reviewboard/templates/notifications/review_request_email.txt
@@ -98,6 +98,6 @@ Repository: {{review_request.repository.name}}
 
 Thanks,
 
-{{ review_request.submitter|user_displayname }}
+{{user|user_displayname}}
 {% endcondense %}
 {% endautoescape %}