diff --git a/main/gradebook/lib/fe/flatviewtable.class.php b/main/gradebook/lib/fe/flatviewtable.class.php
index 691a6fcaeb..5f4923197c 100755
--- a/main/gradebook/lib/fe/flatviewtable.class.php
+++ b/main/gradebook/lib/fe/flatviewtable.class.php
@@ -603,10 +603,11 @@ class FlatViewTable extends SortableTable
     /**
      * @param $user_id
      * @param $name
+     *
      * @return string
      */
     private function build_name_link($user_id, $name)
     {
-        return '<a href="user_stats.php?userid=' . $user_id . '&selectcat=' . $this->selectcat->get_id() . '">' . $name . '</a>';
+        return '<a href="user_stats.php?userid=' . $user_id . '&selectcat=' . $this->selectcat->get_id() . '&'.api_get_cidreq().'">' . $name . '</a>';
     }
 }
diff --git a/main/gradebook/lib/fe/resulttable.class.php b/main/gradebook/lib/fe/resulttable.class.php
index b47337e504..bbc7ad202d 100755
--- a/main/gradebook/lib/fe/resulttable.class.php
+++ b/main/gradebook/lib/fe/resulttable.class.php
@@ -148,8 +148,10 @@ class ResultTable extends SortableTable
 			$edit_column .= ' <a href="' . api_get_self() . '?delete_mark=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '">'.Display::return_icon('delete.png', get_lang('Delete'),'','22').'</a>';
 		}
 		if ($this->evaluation->get_course_code() == null) {
-			$edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();"><img src="../img/delete.gif" border="0" title="' . get_lang('Delete') . '" alt="" /></a>';
-		    $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '"><img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics') . '" alt="" /></a>';
+			$edit_column.= '&nbsp;<a href="' . api_get_self() . '?resultdelete=' . $item['result_id'] . '&selecteval=' . $this->evaluation->get_id() . '" onclick="return confirmationuser();">
+			<img src="../img/delete.gif" border="0" title="' . get_lang('Delete') . '" alt="" /></a>';
+		    $edit_column.= '&nbsp;<a href="user_stats.php?userid=' . $item['id'] . '&selecteval=' . $this->evaluation->get_id() . '&'.api_get_cidreq().'">
+		    <img src="../img/statistics.gif" width="17px" border="0" title="' . get_lang('Statistics') . '" alt="" /></a>';
 		}
 		// Evaluation's origin is a link
 		if ($this->evaluation->get_category_id() < 0) {
diff --git a/main/gradebook/lib/fe/usertable.class.php b/main/gradebook/lib/fe/usertable.class.php
index 00df9379bd..eabf55cc07 100755
--- a/main/gradebook/lib/fe/usertable.class.php
+++ b/main/gradebook/lib/fe/usertable.class.php
@@ -92,8 +92,8 @@ class UserTable extends SortableTable
 		foreach ($data_array as $data) {
 			if ($data[2]!="") {//filter by course removed
 				$row = array ();
-				$row[] = $this->build_type_column ($data[0]);
-				$row[] = $this->build_name_link ($data[0]);
+				$row[] = $this->build_type_column($data[0]);
+				$row[] = $this->build_name_link($data[0]);
 				$row[] = $data[2];
 				$row[] = $data[3];
 				$row[] = $data[4];
diff --git a/main/gradebook/lib/user_data_generator.class.php b/main/gradebook/lib/user_data_generator.class.php
index 3eee9f4e83..e88406db58 100755
--- a/main/gradebook/lib/user_data_generator.class.php
+++ b/main/gradebook/lib/user_data_generator.class.php
@@ -47,13 +47,13 @@ class UserDataGenerator
 				$evals_filtered_copy = $evals;
 			}
 
-		}//isset($coursecode) && strcmp($coursecode,api_get_course_id())===0
+		}
 		if (count($result) == 0) {
 			$evals_filtered=$evals;
 		} else {
 			$evals_filtered=$evals_filtered_copy;
 		}
-		$this->items = array_merge ($evals_filtered, $links);
+		$this->items = array_merge($evals_filtered, $links);
 
 		$this->coursecodecache = array();
 		$this->categorycache = array();
@@ -143,12 +143,12 @@ class UserDataGenerator
 			$row = array ();
 			$row[] = $item;
 			$row[] = $item->get_name();
-			$row[] = $this->build_course_name ($item);
-			$row[] = $this->build_category_name ($item);
-			$row[] = $this->build_average_column ($item, $ignore_score_color);
-			$row[] = $this->build_result_column ($item, $ignore_score_color);
+			$row[] = $this->build_course_name($item);
+			$row[] = $this->build_category_name($item);
+			$row[] = $this->build_average_column($item, $ignore_score_color);
+			$row[] = $this->build_result_column($item, $ignore_score_color);
 			if ($scoredisplay->is_custom())
-				$row[] = $this->build_mask_column ($item, $ignore_score_color);
+				$row[] = $this->build_mask_column($item, $ignore_score_color);
 			$data[] = $row;
 		}
 		return $data;
diff --git a/main/gradebook/user_info.php b/main/gradebook/user_info.php
index 73160a4cc8..bdf75f3cf5 100755
--- a/main/gradebook/user_info.php
+++ b/main/gradebook/user_info.php
@@ -5,8 +5,11 @@
  * Script
  * @package chamilo.gradebook
  */
+
 $language_file = 'gradebook';
+
 //$cidReset = true;
+
 require_once '../inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH) . 'fileManage.lib.php';
 require_once api_get_path(LIBRARY_PATH) . 'export.lib.inc.php';
@@ -28,9 +31,16 @@ require_once 'lib/gradebook_functions.inc.php';
 require_once 'lib/fe/userform.class.php';
 block_students();
 
-$form = new UserForm(UserForm :: TYPE_USER_INFO, $user, 'user_info_form', null, api_get_self() . '?userid=' . $user_id . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+$form = new UserForm(
+    UserForm :: TYPE_USER_INFO,
+    $user,
+    'user_info_form',
+    null,
+    api_get_self() . '?userid=' . $user_id . '&selectcat=' . Security::remove_XSS($_GET['selectcat']).'&'.api_get_cidreq()
+);
+
 if ($form->validate()) {
-    header('Location: user_stats.php?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&userid=' .$user_id);
+    header('Location: user_stats.php?selectcat=' . Security::remove_XSS($_GET['selectcat']).'&userid=' .$user_id.'&'.api_get_cidreq();
     exit;
 }
 
diff --git a/main/gradebook/user_stats.php b/main/gradebook/user_stats.php
index dc2ff05d7c..99603e29a8 100755
--- a/main/gradebook/user_stats.php
+++ b/main/gradebook/user_stats.php
@@ -32,9 +32,9 @@ $interbreadcrumb[]= array (
 ));
 
 $category = Category :: load($_GET['selectcat']);
-$my_user_id=Security::remove_XSS($_GET['userid']);
-$allevals= $category[0]->get_evaluations($my_user_id, true);
-$alllinks= $category[0]->get_links($my_user_id, true);
+$my_user_id = Security::remove_XSS($_GET['userid']);
+$allevals = $category[0]->get_evaluations($my_user_id, true);
+$alllinks = $category[0]->get_links($my_user_id, true);
 
 if ($_GET['selectcat'] != null) {
     $addparams= array (
@@ -48,7 +48,7 @@ if ($_GET['selectcat'] != null) {
     );
 }
 
-$user_table= new UserTable($my_user_id, $allevals, $alllinks, $addparams);
+$user_table = new UserTable($my_user_id, $allevals, $alllinks, $addparams);
 
 if (isset ($_GET['exportpdf'])) {
     $datagen       = new UserDataGenerator($my_user_id, $allevals, $alllinks);