diff --git a/addhost.php b/addhost.php
index 1aa80e634d..1ad8089990 100755
--- a/addhost.php
+++ b/addhost.php
@@ -4,7 +4,7 @@
 include("config.php"); 
 include("includes/functions.php");
 
-if($argv[1] && $argv[2] && $argv[3]) { 
+if($argv[1]) { 
   $host      = strtolower($argv[1]);
   $community = $argv[2];
   $snmpver   = strtolower($argv[3]);
@@ -13,6 +13,9 @@ if($argv[1] && $argv[2] && $argv[3]) {
   else
   	$port = 161;
 
+  if (!$snmpver) $snmpver = "v2c";
+  if (!$community) $community = $config['community'];
+
   list($hostshort) 	= explode(".", $host);
   if ( isDomainResolves($argv[1])){
     if ( isPingable($argv[1])) {
@@ -25,6 +28,6 @@ if($argv[1] && $argv[2] && $argv[3]) {
       } else { echo("Already got host $host\n"); }
     } else { echo("Could not ping $host\n"); }
   } else { echo("Could not resolve $host\n"); }
-} else { echo("Add Host Tool\nUsage: ./addhost.php <hostname> <community> <snmpversion v1|v2c> <port>\n"); }
+} else { echo("Add Host Tool\nUsage: ./addhost.php <hostname> [community] [v1|v2c] [port]\n"); }
 
 ?>