diff --git a/html/pages/addhost.inc.php b/html/pages/addhost.inc.php
index c4168ed6cab5..5e5e2c532ee7 100644
--- a/html/pages/addhost.inc.php
+++ b/html/pages/addhost.inc.php
@@ -11,23 +11,20 @@
     exit;
 }
 
-if (isset($_POST['hostname'])) {
+echo '<div class="row">
+            <div class="col-sm-3">
+            </div>
+            <div class="col-sm-6">';
+
+// first load enabled, after that check snmp variable
+$snmp_enabled = !isset($_POST['hostname']) || isset($_POST['snmp']);
+
+if (!empty($_POST['hostname'])) {
     $hostname = clean($_POST['hostname']);
     if (!is_valid_hostname($hostname) && !IP::isValid($hostname)) {
-        print_error('Invalid hostname or IP.');
-        $hostname = false;
+        print_error("Invalid hostname or IP: $hostname");
     }
-} else {
-    $hostname = false;
-}
 
-$snmp_enabled = isset($_POST['snmp']);
-
-if ($hostname !== false) {
-    echo '<div class="row">
-            <div class="col-sm-3">
-            </div>
-            <div class="col-sm-6">';
     if ($_SESSION['userlevel'] > '5') {
         // Settings common to SNMPv2 & v3
         if ($_POST['port']) {
@@ -93,12 +90,12 @@
         }
     } else {
         print_error("You don't have the necessary privileges to add hosts.");
-    }//end if
-    echo '    </div>
-            <div class="col-sm-3">
-            </div>
-        </div>';
-}//end if
+    }
+}
+echo '    </div>
+        <div class="col-sm-3">
+        </div>
+    </div>';
 
 $pagetitle[] = 'Add host';
 
@@ -364,7 +361,7 @@ classNames: {
 
     $("[name='snmp']").bootstrapSwitch('offColor','danger');
 <?php
-if ($hostname !== false && !$snmp_enabled) {
+if (!$snmp_enabled) {
     echo '  $("[name=\'snmp\']").trigger(\'click\');';
 }
 ?>