diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index 6094582691..c702dd9065 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -346,8 +346,8 @@ class AgentWizard extends HTML
 
         // Capture the parameters.
         $this->protocol = get_parameter('protocol');
+        $this->targetPort = get_parameter('targetPort', '161');
         if ($this->protocol === 'snmp') {
-            $this->targetPort = get_parameter('targetPort', '161');
             $this->community = get_parameter('community', 'public');
             $this->version   = get_parameter('version', '1');
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 00e178005f..7e37604b22 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4869,6 +4869,7 @@ function ui_print_agent_autocomplete_input($parameters)
         $get_only_string_modules = true;
     }
 
+    $no_disabled_modules = true;
     if (isset($parameters['no_disabled_modules'])) {
         $no_disabled_modules = $parameters['no_disabled_modules'];
     }