diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4d77a4f6c9..070ec6732f 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-17  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* include/javascript/pandora_modules.js,
+	godmode/agentes/module_manager_editor.php: fixed the snmp_walk for version
+	2, 2c and 3. Need more test for version 3.
+
 2010-05-17  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/javascript/pandora.js,
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index d634c75cd5..18b3a063ac 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -73,9 +73,32 @@ if (is_ajax ()) {
 	if ($snmp_walk) {
 		$ip_target = (string) get_parameter ('ip_target');
 		$snmp_community = (string) get_parameter ('snmp_community');
+		$snmp_version = get_parameter('snmp_version');
+		$snmp3_auth_user = get_parameter('snmp3_auth_user');
+		$snmp3_security_level = get_parameter('snmp3_security_level');
+		$snmp3_auth_method = get_parameter('snmp3_auth_method');
+		$snmp3_auth_pass = get_parameter('snmp3_auth_pass');
+		$snmp3_privacy_method = get_parameter('snmp3_privacy_method');
+		$snmp3_privacy_pass = get_parameter('snmp3_privacy_pass');
 		
 		snmp_set_quick_print (1);
-		$snmpwalk = @snmprealwalk ($ip_target, $snmp_community, NULL);
+		
+		switch ($snmp_version) {
+			case '3':
+				$snmpwalk = @snmp3_real_walk ($ip_target, $snmp3_auth_user,
+					$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
+					$snmp3_privacy_method, $snmp3_privacy_pass, null);
+				break;
+			case '2':
+			case '2c':
+				$snmpwalk = @snmp2_real_walk ($ip_target, $snmp_community, NULL);
+				break;
+			case '1':
+			default:
+				$snmpwalk = @snmprealwalk ($ip_target, $snmp_community, NULL);	
+				break;
+		}
+		
 		if ($snmpwalk === false) {
 			echo json_encode ($snmpwalk);
 			return;
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index bb6048d2e2..a6f308b7d5 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -196,7 +196,14 @@ function configure_modules_form () {
 			{"page" : "godmode/agentes/module_manager_editor",
 			"snmp_walk" : 1,
 			"ip_target" : $("#text-ip_target").fieldValue (),
-			"snmp_community" : $("#text-snmp_community").fieldValue ()
+			"snmp_community" : $("#text-snmp_community").fieldValue (),
+			"snmp_version": $('#snmp_version').val(),
+			"snmp3_auth_user": $('input[name=snmp3_auth_user]').val(),
+			"snmp3_security_level": $('#snmp3_security_level').val(),
+			"snmp3_auth_method": $('snmp3_auth_method').val(),
+			"snmp3_auth_pass": $('input[name=snmp3_auth_pass]').val(),
+			"snmp3_privacy_method": $('snmp3_privacy_method').val(),
+			"snmp3_privacy_pass": $('input[name=snmp3_privacy_pass]').val()
 			},
 			function (data, status) {
 				if (data == false) {