diff --git a/install/install.php b/install/install.php
index 6334c28b44dab9b9c137a9f7878bba30e5dc5c04..b17336d1ae9acb6ed0c3654392384e171135a508 100644
--- a/install/install.php
+++ b/install/install.php
@@ -445,6 +445,7 @@ if($install_mode == 'standard') {
 		swriteln('Configuring Bastille Firewall');
 		$inst->configure_bastille_firewall();
 		$conf['services']['firewall'] = true;
+		$conf['bastille']['installed'] = true;
 	}
 
 	//* Configure Fail2ban
diff --git a/interface/web/nav.php b/interface/web/nav.php
index 8a49edd7e5d6fa7ecdb0fb7a95ddd5c3f975c3bd..68ceb898beafb15248fa6232b149f1236c8417ee 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -69,7 +69,11 @@ if(isset($_GET['nav']) && $_GET['nav'] == 'top') {
 						$web_servers = $app->db->queryOneRecord("SELECT COUNT(*) as cnt FROM server WHERE web_server = 1 AND active = 1");
 						if($web_servers['cnt'] == 0) continue;
 					}
-					
+					if($mt == 'vm'){
+						$vm_servers = $app->db->queryOneRecord("SELECT COUNT(*) AS cnt FROM server WHERE vserver_server = 1 AND active = 1");
+						if($vm_servers['cnt'] == 0) continue;
+					}
+
 					include_once $mt.'/lib/module.conf.php';
 					$language = (isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language'];
 					$app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');