diff --git a/pandora_console/include/class/Heatmap.class.php b/pandora_console/include/class/Heatmap.class.php
index 3ed4b3cc72..64b7b85b44 100644
--- a/pandora_console/include/class/Heatmap.class.php
+++ b/pandora_console/include/class/Heatmap.class.php
@@ -1270,6 +1270,7 @@ class Heatmap
      */
     public function showHeatmap()
     {
+        global $config;
         $result = $this->getData();
 
         if (empty($result) === true) {
@@ -1371,6 +1372,8 @@ class Heatmap
                                 type: type,
                                 id: id,
                                 id_server: server,
+                                auth_hash: '<?php echo $this->hash; ?>',
+                                id_user: '<?php echo $config['id_user']; ?>'
                             },
                             dataType: 'html',
                             success: function(data) {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8426105f17..72221434db 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -13722,7 +13722,7 @@ button.disabled {
   border: 0px;
 }
 
-.ui-draggable-handle {
+#graph_analytics .ui-draggable-handle {
   z-index: 2 !important;
 }
 
diff --git a/pandora_console/operation/heatmap.php b/pandora_console/operation/heatmap.php
index 7c134ea74a..efc893441d 100644
--- a/pandora_console/operation/heatmap.php
+++ b/pandora_console/operation/heatmap.php
@@ -51,6 +51,8 @@ $height = get_parameter('height', 0);
 $width = get_parameter('width', 0);
 $search = get_parameter('search', '');
 $filter = get_parameter('filter', []);
+$hash = get_parameter('auth_hash', '');
+
 if (is_array($filter) === false) {
     $filter = explode(',', $filter);
 }
@@ -233,7 +235,7 @@ if ($is_ajax === false && $pure === true) {
 // Control call flow.
 try {
     // Heatmap construct.
-    $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group, $dashboard);
+    $heatmap = new Heatmap($type, $filter, $randomId, $refresh, $width, $height, $search, $group, $dashboard, $hash);
 } catch (Exception $e) {
     if (is_ajax() === true) {
         echo json_encode(['error' => '[Heatmap]'.$e->getMessage() ]);
@@ -261,7 +263,7 @@ if ($is_ajax === true) {
     }
 
     // Stop any execution.
-    exit;
+    return;
 } else {
     // Run.
     $heatmap->run();
diff --git a/pandora_console/operation/reporting/graph_analytics.php b/pandora_console/operation/reporting/graph_analytics.php
index 280b0a82bf..4b5facb139 100644
--- a/pandora_console/operation/reporting/graph_analytics.php
+++ b/pandora_console/operation/reporting/graph_analytics.php
@@ -954,6 +954,7 @@ $filters_div = html_print_div(
 
 $graphs_div = html_print_div(
     [
+        'id'      => 'graph_analytics',
         'class'   => 'padding-div graphs-div-main',
         'content' => $right_content,
     ],