diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 3b54389a65..a09381cc66 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -5,7 +5,10 @@
   $device_alerts = "0"; 
   $device_alert_sql = "WHERE 0";
 
+if (isset($config['enable_bgp']) && $config['enable_bgp'])
+{
   $bgp_alerts = mysql_result(mysql_query("SELECT COUNT(*) FROM bgpPeers AS B where (bgpPeerAdminStatus = 'start' OR bgpPeerAdminStatus = 'running') AND bgpPeerState != 'established'"), 0);
+}
 
   $query_a = mysql_query("SELECT * FROM `devices`");
   while($device = mysql_fetch_array($query_a)) {
@@ -225,7 +228,7 @@ echo('<li><a href="ports/?status=0"><img src="images/16/link_error.png" border="
 
 <?php
 
-if ($_SESSION['userlevel'] >= '5') {
+if ($_SESSION['userlevel'] >= '5' && (isset($config['enable_bgp']) && $config['enable_bgp'])) {
 echo('
 <li><a class="menu2four" href="bgp/"><img src="images/16/link.png" border="0" align="absmiddle" /> BGP Sessions</a>
         <table><tr><td>
@@ -248,7 +251,7 @@ echo('        <li><hr /></li>
         </td></tr></table>
 </li>
 ');
-}
+} # If level > 5 && BGP enabled
 
 ?>
 
diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index fdf2f93c56..391fe719a6 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -69,19 +69,21 @@ while($service = mysql_fetch_array($sql)){
 
 }
 
-if($_SESSION['userlevel'] == '10') {
-$sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0");
-} else {
-$sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0");
-}
-while($peer = mysql_fetch_array($sql)){
-
+if (isset($config['enable_bgp']) && $config['enable_bgp'])
+{
+  if($_SESSION['userlevel'] == '10') {
+    $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0");
+  } else {
+    $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0");
+  }
+  while($peer = mysql_fetch_array($sql))
+  {
   generate_front_box("alert", "<center><strong>".generatedevicelink($peer, shorthost($peer['hostname']))."</strong><br />
       <span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>BGP Down</span> 
       <span style='" . (strstr($peer['bgpPeerIdentifier'],':') ? 'font-size: 10px' : '') . "'><strong>".$peer['bgpPeerIdentifier']."</strong></span><br />
       <span title='" . $peer['astext'] . "' class=body-date-1>AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)."</span>
       </center>");
-
+  }
 }
 
 if($_SESSION['userlevel'] == '10') {
diff --git a/includes/discovery/bgp-peers.inc.php b/includes/discovery/bgp-peers.inc.php
index 4b59683556..7e07cb9007 100755
--- a/includes/discovery/bgp-peers.inc.php
+++ b/includes/discovery/bgp-peers.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+if ($config['enable_bgp'])
+{
 ### Discover BGP peers
 
   echo("BGP Sessions : ");
@@ -139,5 +141,6 @@ while ($entry = mysql_fetch_array($query)) {
 unset($peerlist);
 
 echo("\n");
+}
 
 ?>
diff --git a/includes/discovery/os/vrp.inc.php b/includes/discovery/os/vrp.inc.php
index fee80b4def..a3f9a819a8 100644
--- a/includes/discovery/os/vrp.inc.php
+++ b/includes/discovery/os/vrp.inc.php
@@ -4,6 +4,7 @@ if(!$os) {
 
   if(strstr($sysDescr, "VRP (R) Software")) { $os = "vrp"; }
   else if(strstr($sysDescr, "VRP Software Version")) { $os = "vrp"; }
+  else if(strstr($sysDescr, "Software Version VRP")) { $os = "vrp"; }
 
 }