diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index e2aa878f1b..452a9c4d43 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -122,19 +122,75 @@ if ($perform_event_response) {
 	global $config;
 	
 	$command = get_parameter('target','');
-	
-	switch (PHP_OS) {
-		case "FreeBSD":
-			$timeout_bin = '/usr/local/bin/gtimeout';
-			break;
-		case "NetBSD":
-			$timeout_bin = '/usr/pkg/bin/gtimeout';
-			break;
-		default:
-			$timeout_bin = '/usr/bin/timeout';
-			break;
+	$response_id = get_parameter ('response_id');
+
+	$event_response = db_get_row('tevent_response','id',$response_id);
+
+	if (enterprise_installed()) {
+		if ($event_response['server_to_exec'] != 0) {
+			enterprise_include_once ('include/functions_satellite.php');
+			
+			$connection = connect_to_proxy_server('192.168.70.165');
+			
+			switch (PHP_OS) {
+				case "FreeBSD":
+					$timeout_bin = '/usr/local/bin/gtimeout';
+					break;
+				case "NetBSD":
+					$timeout_bin = '/usr/pkg/bin/gtimeout';
+					break;
+				default:
+					$timeout_bin = '/usr/bin/timeout';
+					break;
+			}
+
+			$stream = ssh2_exec($connection, "whoami");
+    
+			stream_set_blocking($stream, true);
+			$stream_out = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
+
+			$exec_val = stream_get_contents($stream_out);
+
+
+
+			$stream = ssh2_exec($connection, $timeout_bin . ' 9 ' . io_safe_output($command) . ' 2>&1');
+			
+			stream_set_blocking($stream, true);
+			$stream_out = ssh2_fetch_stream($stream, SSH2_STREAM_STDIO);
+
+			$exec_val = stream_get_contents($stream_out);
+			
+			echo $exec_val;
+		}
+		else {
+			switch (PHP_OS) {
+				case "FreeBSD":
+					$timeout_bin = '/usr/local/bin/gtimeout';
+					break;
+				case "NetBSD":
+					$timeout_bin = '/usr/pkg/bin/gtimeout';
+					break;
+				default:
+					$timeout_bin = '/usr/bin/timeout';
+					break;
+			}
+			echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
+		}
+	}
+	else {
+		switch (PHP_OS) {
+			case "FreeBSD":
+				$timeout_bin = '/usr/local/bin/gtimeout';
+				break;
+			case "NetBSD":
+				$timeout_bin = '/usr/pkg/bin/gtimeout';
+				break;
+			default:
+				$timeout_bin = '/usr/bin/timeout';
+				break;
+		}
+		echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
 	}
-	echo system($timeout_bin . ' 9 '.io_safe_output($command).' 2>&1');
 	
 	return;
 }
@@ -162,7 +218,7 @@ if ($dialogue_event_response) {
 			echo "<br><div id='response_out' style='text-align:left'></div>";
 			
 			echo "<br><div id='re_exec_command' style='display:none;'>";
-			html_print_button(__('Execute again'),'btn_str',false,'perform_response(\''.$command.'\');', "class='sub next'");
+			html_print_button(__('Execute again'),'btn_str',false,'perform_response(\''.$command.'\', ' . $response_id . ');', "class='sub next'");
 			echo "</div>";
 			break;
 		case 'url':
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 80c6affeb5..bd9b6cfcb6 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -177,7 +177,7 @@ function show_response_dialog(event_id, response_id, response) {
 					draggable: true,
 					modal: false,
 					open: function(event, ui) {
-						perform_response(response['target']);
+						perform_response(response['target'], response_id);
 					},
 					width: response['modal_width'], 
 					height: response['modal_height']
@@ -336,7 +336,7 @@ function get_response_target(event_id, response_id, server_id) {
 }
 
 // Perform a response and put the output into a div
-function perform_response(target) {
+function perform_response(target, response_id) {
 	var ajax_file = $('#hidden-ajax_file').val();
 	
 	$('#re_exec_command').hide();
@@ -351,6 +351,7 @@ function perform_response(target) {
 	params.push("page=include/ajax/events");
 	params.push("perform_event_response=1");
 	params.push("target="+target);
+	params.push("response_id="+response_id)
 	
 	jQuery.ajax ({
 		data: params.join ("&"),