diff --git a/main/cron/course_finished.php b/main/cron/course_finished.php
index 09ef160a3b..b82d6cb59c 100644
--- a/main/cron/course_finished.php
+++ b/main/cron/course_finished.php
@@ -47,27 +47,6 @@ $administrator = [
 ];
 
 foreach ($sessions as $session) {
-    $mailSubject = sprintf(
-        get_lang('MailCronCourseFinishedSubject'),
-        $session->getName()
-    );
-
-    $accessUrls = $accessUrlRepo->createQueryBuilder('au')
-        ->select('au')
-        ->innerJoin(
-            'ChamiloCoreBundle:AccessUrlRelSession',
-            'aus',
-            Doctrine\ORM\Query\Expr\Join::WITH,
-            'au.id = aus.accessUrlId'
-        )
-        ->where('aus.sessionId = :session')
-        ->setParameter('session', $session)
-        ->setMaxResults(1)
-        ->getQuery()
-        ->getResult();
-
-    $accessUrl = current($accessUrls);
-
     $sessionUsers = $session->getUsers();
 
     if (empty($sessionUsers)) {
@@ -78,21 +57,26 @@ foreach ($sessions as $session) {
     foreach ($sessionUsers as $sessionUser) {
         $user = $sessionUser->getUser();
 
-        $mailBody = vsprintf(
-            get_lang('MailCronCourseFinishedBody'),
-            [
-                $user->getCompleteName(),
-                $session->getName(),
-                $accessUrl->getUrl(),
-                api_get_setting("siteName")
-            ]
+        $subjectTemplate = new Template(null, false, false, false, false, false);
+        $subjectTemplate->assign('session_name', $session->getName());
+
+        $subjectLayout = $subjectTemplate->get_template(
+            'mail/cron_course_finished_subject.tpl'
+        );
+
+        $bodyTemplate = new Template(null, false, false, false, false, false);
+        $bodyTemplate->assign('complete_user_name', $user->getCompleteName());
+        $bodyTemplate->assign('session_name', $session->getName());
+
+        $bodyLayout = $bodyTemplate->get_template(
+            'mail/cron_course_finished_body.tpl'
         );
 
         api_mail_html(
             $user->getCompleteName(),
             $user->getEmail(),
-            $mailSubject,
-            $mailBody,
+            $subjectTemplate->fetch($subjectLayout),
+            $bodyTemplate->fetch($bodyLayout),
             $administrator['complete_name'],
             $administrator['email']
         );
diff --git a/main/template/default/mail/cron_course_finished_body.tpl b/main/template/default/mail/cron_course_finished_body.tpl
new file mode 100644
index 0000000000..6efdb34e9f
--- /dev/null
+++ b/main/template/default/mail/cron_course_finished_body.tpl
@@ -0,0 +1 @@
+{{ 'MailCronCourseFinishedBody'|get_lang|format(complete_user_name, session_name, session_name, _s.site_name) }}
diff --git a/main/template/default/mail/cron_course_finished_subject.tpl b/main/template/default/mail/cron_course_finished_subject.tpl
new file mode 100644
index 0000000000..1220e84f13
--- /dev/null
+++ b/main/template/default/mail/cron_course_finished_subject.tpl
@@ -0,0 +1 @@
+{{ 'MailCronCourseFinishedSubject'|get_lang|format(session_name)  }}