diff --git a/admin/judges_teams_members.php b/admin/judges_teams_members.php
index 242e8d81..da003b8b 100644
--- a/admin/judges_teams_members.php
+++ b/admin/judges_teams_members.php
@@ -327,7 +327,7 @@ function switchjudgeinfo()
 			foreach($team['members'] AS $member)
 			{
 				echo "<tr><td>";
-				echo "<a onclick=\"return confirmClick('Are you sure you want to remove this judge from this team?')\" href=\"judges_teams_members.php?action=del&team_id=".$team['id']."&team_num=".$team['num']."&team_name=".htmlspecialchars($team['name'])."&judges_id=".$member['id']."\"><img border=0 src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\"></a>";
+				echo "<a onclick=\"return confirmClick('Are you sure you want to remove this judge from this team?')\" href=\"judges_teams_members.php?action=del&team_id=".$team['id']."&team_num=".$team['num']."&judges_id=".$member['id']."&team_name=".rawurlencode($team['name'])."\"><img border=0 src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\"></a>";
 				echo "</td><td width=\"100%\">";
 				if($member['captain']=="yes")
 				{
@@ -350,7 +350,7 @@ function switchjudgeinfo()
 			}
 
 			echo "<tr><td colspan=\"2\">";
-			echo "<a onclick=\"return confirmClick('Are you sure you want to empty all judges from this team?')\" href=\"judges_teams_members.php?action=empty&team_id=".$team['id']."&team_num=".$team['num']."&team_name=".htmlspecialchars($team['name'])."\">";
+			echo "<a onclick=\"return confirmClick('Are you sure you want to empty all judges from this team?')\" href=\"judges_teams_members.php?action=empty&team_id=".$team['id']."&team_num=".$team['num']."&team_name=".rawurlencode($team['name'])."\">";
 			echo " ".i18n("Empty All Members")." ";
 			echo "<img border=0 src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\">";
 			echo "</a>";