diff --git a/plugin/buycourses/lang/brazilian.php b/plugin/buycourses/lang/brazilian.php
index 46daeebf72..2dc9fb66d7 100644
--- a/plugin/buycourses/lang/brazilian.php
+++ b/plugin/buycourses/lang/brazilian.php
@@ -47,7 +47,7 @@ $strings['CancelOrder'] = "Anular ordem";
 $strings['BankAccountInformation'] = "Detalhes da conta bancária";
 $strings['BankAccount'] = "Contas bancárias";
 $strings['OnceItIsConfirmedYouWillReceiveAnEmailWithTheBankInformationAndAnOrderReference'] = "Uma vez confirmada, você receberá um e-mail com os dados bancários e uma referência de ordem.";
-$strings['SubscriptionToCourseXSuccessful'] = "Sua inscrição para \"%s\ foi concluída com sucesso.";
+$strings['SubscriptionToCourseXSuccessful'] = "Sua inscrição para <a href=\"%s\"><strong>\"%s\"</strong></a> foi concluída com sucesso.";
 $strings['OrderCanceled'] = "Ordem cancelada";
 $strings['OrderStatus'] = "Status do pedido";
 $strings['SearchByStatus'] = "Pesquisar por estado";
diff --git a/plugin/buycourses/lang/dutch.php b/plugin/buycourses/lang/dutch.php
index 9c5dbc0c9b..d265f6c109 100644
--- a/plugin/buycourses/lang/dutch.php
+++ b/plugin/buycourses/lang/dutch.php
@@ -82,7 +82,7 @@ $strings['CancelOrder'] = "Annuleer order";
 $strings['BankAccountInformation'] = "Bankgegevens";
 $strings['BankAccount'] = "Bankrekening";
 $strings['OnceItIsConfirmedYouWillReceiveAnEmailWithTheBankInformationAndAnOrderReference'] = "Eenmaal bevestigd, ontvangt u een e-mail met de bankgegevens en een orderreferentie.";
-$strings['SubscriptionToCourseXSuccessful'] = "Uw aankoop op \"%s \" werd met succes afgerond.";
+$strings['SubscriptionToCourseXSuccessful'] = "Uw aankoop op <a href=\"%s\"><strong>\"%s\"</strong></a> werd met succes afgerond.";
 $strings['OrderCanceled'] = "Order geannuleerd";
 $strings['OrderStatus'] = "Bestelstatus";
 $strings['PayoutStatus'] = "Betalingsstatus";
diff --git a/plugin/buycourses/lang/english.php b/plugin/buycourses/lang/english.php
index a32c3807bb..1a5ca76432 100644
--- a/plugin/buycourses/lang/english.php
+++ b/plugin/buycourses/lang/english.php
@@ -82,7 +82,7 @@ $strings['CancelOrder'] = "Cancel order";
 $strings['BankAccountInformation'] = "Bank account details";
 $strings['BankAccount'] = "Bank account";
 $strings['OnceItIsConfirmedYouWillReceiveAnEmailWithTheBankInformationAndAnOrderReference'] = "Once confirmed, you will receive an e-mail with the bank details and an order reference.";
-$strings['SubscriptionToCourseXSuccessful'] = "Your subscription to \"%s\" was completed successfully.";
+$strings['SubscriptionToCourseXSuccessful'] = "Your subscription to <a href=\"%s\"><strong>\"%s\"</strong></a> was completed successfully.";
 $strings['OrderCanceled'] = "Order canceled";
 $strings['OrderStatus'] = "Order status";
 $strings['PayoutStatus'] = "Payment status";
diff --git a/plugin/buycourses/lang/french.php b/plugin/buycourses/lang/french.php
index 08e1aa3040..5931920271 100644
--- a/plugin/buycourses/lang/french.php
+++ b/plugin/buycourses/lang/french.php
@@ -82,7 +82,7 @@ $strings['CancelOrder'] = "Annuler la commande";
 $strings['BankAccountInformation'] = "Détails du compte bancaire";
 $strings['BankAccount'] = "Compte bancaire";
 $strings['OnceItIsConfirmedYouWillReceiveAnEmailWithTheBankInformationAndAnOrderReference'] = "Une fois confirmée, vous recevrez un e-mail avec les données bancaires et la référence de la commande";
-$strings['SubscriptionToCourseXSuccessful'] = "Votre inscription au \"%s\" est terminée.";
+$strings['SubscriptionToCourseXSuccessful'] = "Votre inscription au <a href=\"%s\"><strong>\"%s\"</strong></a> est terminée.";
 $strings['OrderCanceled'] = "Commande annulée";
 $strings['OrderStatus'] = "Statut de commande";
 $strings['PayoutStatus'] = "État du paiement";
diff --git a/plugin/buycourses/lang/spanish.php b/plugin/buycourses/lang/spanish.php
index 54ba33d367..dddc5644bc 100644
--- a/plugin/buycourses/lang/spanish.php
+++ b/plugin/buycourses/lang/spanish.php
@@ -83,7 +83,7 @@ $strings['CancelOrder'] = "Cancelar Orden";
 $strings['BankAccountInformation'] = "Información de la Cuenta Bancaria";
 $strings['BankAccount'] = "Cuenta Bancaria";
 $strings['OnceItIsConfirmedYouWillReceiveAnEmailWithTheBankInformationAndAnOrderReference'] = "Una vez confirmado, recibira un e-mail con los datos bancarios y una referencia del pedido.";
-$strings['SubscriptionToCourseXSuccessful'] = "Tu subscripción a \"%s\" se realizó correctamente.";
+$strings['SubscriptionToCourseXSuccessful'] = "<p class=\"lead\">Tu subscripción a <a href=\"%s\"><strong>\"%s\"</strong></a> se realizó correctamente.</p>";
 $strings['OrderCanceled'] = "Pedido cancelado";
 $strings['OrderStatus'] = "Estado del pedido";
 $strings['PayoutStatus'] = "Estado del pago";
diff --git a/plugin/buycourses/src/buy_course_plugin.class.php b/plugin/buycourses/src/buy_course_plugin.class.php
index d676c427b4..265d646cc4 100644
--- a/plugin/buycourses/src/buy_course_plugin.class.php
+++ b/plugin/buycourses/src/buy_course_plugin.class.php
@@ -2542,4 +2542,35 @@ class BuyCoursesPlugin extends Plugin
             ['id = ?' => (int) $serviceSaleId]
         );
     }
+
+    /**
+     * @param array $saleInfo
+     *
+     * @return string
+     */
+    public function getSubscriptionSuccessMessage(array $saleInfo)
+    {
+        switch ($saleInfo['product_type']) {
+            case self::PRODUCT_TYPE_COURSE:
+                $courseInfo = api_get_course_info_by_id($saleInfo['product_id']);
+                $url = api_get_course_url($courseInfo['code']);
+                break;
+            case self::PRODUCT_TYPE_SESSION:
+                $sessionId = (int) $saleInfo['product_id'];
+                $url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$sessionId;
+                break;
+            default:
+                $url = '#';
+        }
+
+        return Display::return_message(
+            sprintf(
+                $this->get_lang('SubscriptionToCourseXSuccessful'),
+                $url,
+                $saleInfo['product_name']
+            ),
+            'success',
+            false
+        );
+    }
 }
diff --git a/plugin/buycourses/src/buycourses.ajax.php b/plugin/buycourses/src/buycourses.ajax.php
index 1f04390b16..02529ecc97 100644
--- a/plugin/buycourses/src/buycourses.ajax.php
+++ b/plugin/buycourses/src/buycourses.ajax.php
@@ -328,10 +328,7 @@ switch ($action) {
 
                 if ($saleIsCompleted) {
                     Display::addFlash(
-                        Display::return_message(
-                            sprintf($plugin->get_lang('SubscriptionToCourseXSuccessful'), $sale['product_name']),
-                            'success'
-                        )
+                        $plugin->getSubscriptionSuccessMessage($sale)
                     );
                 }
             }
diff --git a/plugin/buycourses/src/sales_report.php b/plugin/buycourses/src/sales_report.php
index 08043769a2..1184497620 100644
--- a/plugin/buycourses/src/sales_report.php
+++ b/plugin/buycourses/src/sales_report.php
@@ -33,10 +33,7 @@ if (isset($_GET['order'])) {
             $plugin->completeSale($sale['id']);
             $plugin->storePayouts($sale['id']);
             Display::addFlash(
-                Display::return_message(
-                    sprintf($plugin->get_lang('SubscriptionToCourseXSuccessful'), $sale['product_name']),
-                    'success'
-                )
+                $plugin->getSubscriptionSuccessMessage($sale)
             );
 
             $urlToRedirect .= http_build_query([
diff --git a/plugin/buycourses/src/success.php b/plugin/buycourses/src/success.php
index 9784284271..2b2caffa4f 100644
--- a/plugin/buycourses/src/success.php
+++ b/plugin/buycourses/src/success.php
@@ -83,23 +83,9 @@ if ($form->validate()) {
     switch ($confirmPayments['PAYMENTINFO_0_PAYMENTSTATUS']) {
         case 'Completed':
             $saleIsCompleted = $plugin->completeSale($sale['id']);
-            if ($saleIsCompleted && $buyingSession) {
+            if ($saleIsCompleted) {
                 Display::addFlash(
-                    Display::return_message(
-                        sprintf($plugin->get_lang('SubscriptionToCourseXSuccessful'), $session['name']),
-                        'success'
-                    )
-                );
-                $plugin->storePayouts($sale['id']);
-                break;
-            }
-
-            if ($saleIsCompleted && $buyingCourse) {
-                Display::addFlash(
-                    Display::return_message(
-                        sprintf($plugin->get_lang('SubscriptionToCourseXSuccessful'), $course['title']),
-                        'success'
-                    )
+                    $plugin->getSubscriptionSuccessMessage($sale)
                 );
                 $plugin->storePayouts($sale['id']);
                 break;