diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php
index adbc13180e..12fcaaa39e 100755
--- a/pandora_console/godmode/wizards/HostDevices.class.php
+++ b/pandora_console/godmode/wizards/HostDevices.class.php
@@ -276,10 +276,9 @@ class HostDevices extends Wizard
 
                 if ($task !== false) {
                     $this->task = $task;
+                    $this->msg = __('This network scan task has been already defined. Please edit it or create a new one.');
+                    return false;
                 }
-
-                $this->msg = __('This network scan task has been already defined. Please edit it or create a new one.');
-                return false;
             }
 
             if (isset($this->task['id_rt']) === false) {
diff --git a/pandora_server/lib/PandoraFMS/Recon/Base.pm b/pandora_server/lib/PandoraFMS/Recon/Base.pm
index 8d24ebf311..116bcd75e6 100644
--- a/pandora_server/lib/PandoraFMS/Recon/Base.pm
+++ b/pandora_server/lib/PandoraFMS/Recon/Base.pm
@@ -1500,6 +1500,9 @@ sub snmp_get_command {
 
 	my $command = "snmpwalk -M/dev/null -r$self->{'snmp_checks'} -t$self->{'snmp_timeout'} -v$self->{'snmp_version'} -On -Oe ";
 	if ($self->{'snmp_version'} eq "3") {
+		if ($self->{'community'}) { # Context
+			$command .= " -N $self->{'community} ";
+		}
 		$command .= " -l$self->{'snmp_security_level'} ";
 		if ($self->{'snmp_security_level'} ne "noAuthNoPriv") {
 			$command .= " -u$self->{'snmp_auth_user'} -a$self->{'snmp_auth_method'} -A$self->{'snmp_auth_pass'} ";