diff --git a/CHANGES.md b/CHANGES.md
index 907d930..f796fc8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,7 +9,7 @@ Note - All hash comments refer to the issue number. Eg. #169 refers to https://g
 ### Fixed
 - Usage of deprecated functions (#423)
 
-## [3.10.1] - 2021-XX-YY
+## [3.10.1] - 2021-06-13
 
 ### Added
 - Usage of github actions (#407).
@@ -20,6 +20,7 @@ Note - All hash comments refer to the issue number. Eg. #169 refers to https://g
 - Managers are now able to download their students' certificates (#412).
 - Users being able to view the certificate before the required time set (#403).
 - Fixed the issue with displaying PDF when debugging is ON (#420).
+- Using incorrect context when sending emails (#402).
 
 ## [3.8.5] - 2020-11-26
 
diff --git a/classes/task/email_certificate_task.php b/classes/task/email_certificate_task.php
index 1c5878a..074ef0c 100644
--- a/classes/task/email_certificate_task.php
+++ b/classes/task/email_certificate_task.php
@@ -86,6 +86,9 @@ class email_certificate_task extends \core\task\scheduled_task {
             // Get the context.
             $context = \context::instance_by_id($customcert->contextid);
 
+            // Set the $PAGE context - this ensure settings, such as language, are kept and don't default to the site settings.
+            $PAGE->set_context($context);
+
             // Get the person we are going to send this email on behalf of.
             $userfrom = \core_user::get_noreply_user();