diff --git a/Templates/Build/37_hero.tpl b/Templates/Build/37_hero.tpl
index f8c2da2e..3fba836d 100644
--- a/Templates/Build/37_hero.tpl
+++ b/Templates/Build/37_hero.tpl
@@ -12,10 +12,11 @@
 include_once("GameEngine/Data/hero_full.php");
 global $database; 
 
-if (isset($_POST['name'])) { 
-	$_POST['name'] = stripslashes($_POST['name']);
-	mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."hero SET `name`='".($database->escape($_POST['name']))."' where `uid`='".$database->escape($session->uid)."' AND dead = 0") or die("ERROR:".mysqli_error($database->dblink));   
-    echo "".NAME_CHANGED.""; 
+if (isset($_POST['name']) && !empty($_POST['name'])) { 
+    $_POST['name'] = $database->escape(stripslashes($_POST['name']));
+	mysqli_query($GLOBALS['link'],"UPDATE ".TB_PREFIX."hero SET `name`='".$_POST['name']."' where `uid`='".$database->escape($session->uid)."' AND dead = 0") or die("ERROR:".mysqli_error($database->dblink));   
+	$hero_info['name'] = $_POST['name'];
+	echo "".NAME_CHANGED.""; 
 }
 ?>