diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 496bf0e067..72a789254f 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -878,6 +878,13 @@ if ($form->validate()) {
     }
 
     SessionManager::redirectToSession();
+
+    $redirectBuyCourse = Session::read('buy_course_redirect');
+    if (!empty($redirectBuyCourse)) {
+        $form_data['action'] = api_get_path(WEB_PATH).$redirectBuyCourse;
+        Session::erase('buy_course_redirect');
+    }
+
     $form_data = CourseManager::redirectToCourse($form_data);
 
     $form_register = new FormValidator('form_register', 'post', $form_data['action']);
diff --git a/plugin/buycourses/src/process.php b/plugin/buycourses/src/process.php
index 8a3e02b4a5..2b0dbea605 100644
--- a/plugin/buycourses/src/process.php
+++ b/plugin/buycourses/src/process.php
@@ -1,6 +1,8 @@
 <?php
 /* For license terms, see /license.txt */
 
+use ChamiloSession as Session;
+
 /**
  * Process payments for the Buy Courses plugin
  * @package chamilo.plugin.buycourses
@@ -10,7 +12,8 @@ require_once '../config.php';
 $currentUserId = api_get_user_id();
 
 if (empty($currentUserId)) {
-    header('Location: ' . api_get_path(WEB_CODE_PATH) . 'auth/inscription.php');
+    Session::write('buy_course_redirect', Security::remove_XSS($_SERVER['REQUEST_URI']));
+    header('Location: '.api_get_path(WEB_CODE_PATH).'auth/inscription.php');
     exit;
 }