diff --git a/include/functions.php b/include/functions.php
index 4a8c8ad..e055f47 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -72,20 +72,35 @@ function showMode($mode, $mmdvmconfigs) {
 ?>
       <td><span class="label <?php 
 	if (getEnabled($mode, $mmdvmconfigs) == 1) {
-		if ($mode == "D-Star Network") {
-			if (isProcessRunning(IRCDDBGATEWAY)) {
-				echo "label-success";		
-			} else {
-				echo "label-danger\" title=\"ircddbgateway is down!";
-			}
-		} else {
-			if ($mode == "D-Star" || $mode =="DMR" || $mode =="DMR Network" || $mode =="System Fusion" || $mode =="System Fusion Network") {
+		switch ($mode) {
+			case "D-Star Network":
+				if (getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "localhost" || getConfigItem("D-Star Network", "GatewayAddress", $mmdvmconfigs) == "127.0.0.1") {
+					if (isProcessRunning(IRCDDBGATEWAY)) {
+						echo "label-success";		
+					} else {
+						echo "label-danger\" title=\"ircddbgateway is down!";
+					}
+				} else {
+					echo "label-default\" title=\"Remote gateway configured - not checked!";
+				}
+				break;
+			case "System Fusion Network":
+				if (getConfigItem("System Fusion Network", "GwyAddress", $mmdvmconfigs) == "localhost" || getConfigItem("System Fusion Network", "GwyAddress", $mmdvmconfigs) == "127.0.0.1") {
+					if (isProcessRunning("YSFGateway")) {
+						echo "label-success";		
+					} else {
+						echo "label-danger\" title=\"YSFGateway is down!";
+					}
+				} else {
+					echo "label-default\" title=\"Remote gateway configured - not checked!";
+				}
+				break;
+			default:
 				if (isProcessRunning("MMDVMHost")) {
 					echo "label-success";		
 				} else {
 					echo "label-danger\" title=\"MMDVMHost is down!";
 				}
-			}	
 		}
 	} else {
 		echo "label-default";
diff --git a/version.php b/version.php
index 20ee740..0d3ac62 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20160828-1");
+define("VERSION", "20160901-1");
 ?>
\ No newline at end of file