diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b462243586..d9228fd1b8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-19  Ramon Novoa  <rnovoa@artica.es>
+
+	* godmode/servers/modificar_server.php: Added an option to reset
+	  counts.
+
 2013-03-19  Ramon Novoa  <rnovoa@artica.es>
 
 	* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 91ab7af41c..3131a38b03 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -61,6 +61,11 @@ else {
 		db_process_sql ("UPDATE tagente_estado SET last_error=0 WHERE last_error=1");
 	}
 	
+	// Move SNMP modules back to the enterprise server
+	if (isset($_GET["server_reset_counts"])) {
+		db_process_sql ("UPDATE tagente SET update_module_count=1, update_alert_count=1");
+	}
+
 	if (isset ($_GET["delete"])) {
 		$id_server = get_parameter_get ("server_del");
 		
@@ -168,7 +173,12 @@ else {
 		if (check_acl ($config["id_user"], 0, "PM")) {
 			
 			$data[8] = '';
-			if ($server['type'] == 'enterprise snmp') {
+			if ($server['type'] == 'data') {
+				$data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_reset_counts='.$server["id_server"].'">';
+				$data[8] .= html_print_image ('images/target.png', true,
+					array('title' => __('Reset module status and fired alert counts')));
+				$data[8] .= '</a>&nbsp;&nbsp;';
+			} else if ($server['type'] == 'enterprise snmp') {
 				$data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_reset_snmp_enterprise='.$server["id_server"].'">';
 				$data[8] .= html_print_image ('images/target.png', true,
 					array('title' => __('Claim back SNMP modules')));