diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 460d9dc260..c7208f5876 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1231,7 +1231,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 		$field19 = defined($alert->{'field19'})  && $alert->{'field19'} ne "" ? $alert->{'field19'} : $action->{'field19'};
 		$field20 = defined($alert->{'field20'})  && $alert->{'field20'} ne "" ? $alert->{'field20'} : $action->{'field20'};
 	}
-	
+
 	# Recovery fields, thanks to Kato Atsushi
 	if ($alert_mode == RECOVERED_ALERT) {
 		# Field 1 is a special case where [RECOVER] prefix is not added even when it is defined
@@ -1587,11 +1587,11 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 			my $period = $hours * 3600; # Hours to seconds
 			if($threshold == 0){
 				$params->{"other"} = $period . '%7C1%7C0%7C225%7C%7C14';
-				$cid = 'module_graph_' . $hours . 'h';
+				$cid = 'module_graph_' . (defined($module) && $module ne '' ?  ($module . '_') : '') . $hours . 'h';
 			}
 			else{
 				$params->{"other"} = $period . '%7C1%7C1%7C225%7C%7C14';
-				$cid = 'module_graphth_' . $hours . 'h';
+				$cid = 'module_graphth_' . (defined($module) && $module ne '' ?  ($module . '_') : '') . $hours . 'h';
 			}
 
 			if (defined($module)) {
@@ -1689,7 +1689,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
 			. "Content-Location: " . $dataname . "\n\n"
 			. $base64_data . "\n";
 		}
-		
+
 		if ($pa_config->{"mail_in_separate"} != 0){
 			foreach my $address (split (',', $field1)) {
 				# Remove blanks