diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 0b73923d..312708e0 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -76,7 +76,7 @@ class Automation {
 			case 42: $build = "Great Workshop"; break;
 			default: $build = "Nothing had"; break;
 		}
-		return $build;
+		return addslashes($build);
 	}
 
 	function recountPop($vid){
diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl
index 06290f3f..320a8986 100644
--- a/Templates/Build/16_incomming.tpl
+++ b/Templates/Build/16_incomming.tpl
@@ -39,7 +39,7 @@ if ($units[$y]['sort_type']==3){
                   for($i=$start;$i<=($end);$i++) {
                   	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";	
                   }
-				  if($units[$y]['t11'] != 0) {
+				  if($units[$y]['t11'] != 0 && $reinfowner == $session->uid) {
                    echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";    
                   }
                   echo "</tr><tr><th>Troops</th>";