diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index c34a3f857a..74958e227a 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -83,12 +83,18 @@ foreach ($servers as $server) {
 	
 	// Type
 	if ($server['type'] == 'data'){
-		$data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> (<span style="font-size:8px;">' . $server["version"]. '</span>)';
+		$data[2] = '<span style="white-space:nowrap;">'.$server["img"];
+		if ($server["master"] == 1){
+			$data[2] .= ui_print_help_tip (__("This is a master server"), true). '</span> <span style="font-size:8px;"> v' . $server["version"]. '</span>';
+		}
+		else{
+			$data[2] .= '</span> (<span style="font-size:8px;"> v' . $server["version"]. '</span>)';
+		}
 	}
 	else{
 		$data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> ('.ucfirst($server["type"]).")";
 	}
-	if ($server["master"] == 1)
+	if ($server["master"] == 1 and $server['type'] != 'data')
 		$data[2] .= ui_print_help_tip (__("This is a master server"), true);
 	
 	switch ($server['type']) {