diff --git a/main/course_info/delete_course.php b/main/course_info/delete_course.php
index 38e710cc61..9a89fa7857 100644
--- a/main/course_info/delete_course.php
+++ b/main/course_info/delete_course.php
@@ -10,6 +10,7 @@
 /**
  * Code
  */
+use \ChamiloSession as Session;
 
 // Language files that need to be included
 $language_file = array('admin', 'course_info');
@@ -18,39 +19,42 @@ require_once '../inc/global.inc.php';
 require_once '../gradebook/lib/be/gradebookitem.class.php';
 require_once '../gradebook/lib/be/category.class.php';
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_COURSE_MAINTENANCE;
+$current_course_tool = TOOL_COURSE_MAINTENANCE;
 api_protect_course_script(true);
 
+$_course = api_get_course_info();
+
 $current_course_code = $_course['official_code'];
 $current_course_name = $_course['name'];
 
 if (!api_is_allowed_to_edit()) {
 	api_not_allowed(true);
 }
+
 $tool_name = get_lang('DelCourse');
 
 if (isset($_GET['delete']) && $_GET['delete'] == 'yes') {
-	CourseManager :: delete_course($_course['sysCode']);
+	CourseManager::delete_course($_course['sysCode']);
 	$obj_cat = new Category();
 	$obj_cat->update_category_delete($_course['sysCode']);
 
 	// DELETE CONFIRMATION MESSAGE
-	unset($_course);
-	unset($_cid);
+    Session::erase('_cid');
+    Session::erase('_real_cid');
 	$noPHP_SELF = true;
 	$message = '<h2>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h2>';
     $message .=get_lang('HasDel');
 	$message .= '<br /><br /><a href="../../index.php">'.get_lang('BackHome').' '.api_get_setting('siteName').'</a>';
 
-} else {	
+} else {
     $message = '<h3>'.get_lang('Course').' : '.$current_course_name.' ('.$current_course_code.') </h3>';
-    $message .= '<p>'.get_lang('ByDel').'</p><p><a class="btn btn-primary" href="maintenance.php">'.get_lang('No').'</a>&nbsp;<a class="btn" href="'.api_get_self().'?delete=yes">'.get_lang('Yes').'</a></p>';
+    $message .= '<p>'.get_lang('ByDel').'</p>';
+    $message .= '<p><a class="btn btn-primary" href="'.api_get_path(WEB_CODE_PATH).'course_info/maintenance.php?'.api_get_cidreq().'">'.
+        get_lang('No').'</a>&nbsp;<a class="btn" href="'.api_get_self().'?delete=yes&'.api_get_cidreq().'">'.
+        get_lang('Yes').'</a></p>';
 	$interbreadcrumb[] = array('url' => 'maintenance.php', 'name' => get_lang('Maintenance'));
 }
 Display :: display_header($tool_name, 'Settings');
 echo Display::page_header($tool_name);
 Display::display_warning_message($message, false);
-
-/*	FOOTER */
-
 Display :: display_footer();