diff --git a/checkin_notes b/checkin_notes
index afc16f583c..025f7626ac 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -13104,3 +13104,14 @@ Charlie 12 Oct 2005
 
     mac_build/
         BuildMacBOINC.sh
+
+Janus  13 Oct 2005
+    - The HTML version of the teamname wasn't displayed correctly on the
+      teampages.
+
+    html/
+        inc/
+            team.inc
+        user/
+            team_edit_form.php
+
diff --git a/html/inc/team.inc b/html/inc/team.inc
index cbd805c6ae..0c44ec327a 100644
--- a/html/inc/team.inc
+++ b/html/inc/team.inc
@@ -41,6 +41,7 @@ function display_team_page($team, $offset, $sort_by) {
     
     page_head("$team->name");
 
+    echo sanitize_html($team->name_html);
     start_table();
     row1("Team info");
     if (strlen($team->description)) {
@@ -215,7 +216,7 @@ function team_edit_form($team, $label, $url) {
         <br><font size=-2>
         You may include HTML formatting, link, and image tags.
         If you don't know HTML, just leave this box blank.",
-        "<input name=name_html type=text size=50 value=\"$team->name_html\">"
+        "<input name=name_html type=text size=50 value=\"".str_replace('"',"'",$team->name_html)."\">"
     );
     row2("URL of team web page, if any:<br><font size=-2>(without \"http://\")
         This URL will be linked to from the team's page on this site.",
diff --git a/html/user/team_edit_form.php b/html/user/team_edit_form.php
index 8ccc497fcf..713f936932 100644
--- a/html/user/team_edit_form.php
+++ b/html/user/team_edit_form.php
@@ -12,9 +12,6 @@ $team = lookup_team($teamid);
 require_founder_login($user, $team);
 
 $team_name = ereg_replace("\"", "'", $team->name);
-$team_name_html = ereg_replace("\"", "'", $team->name_html);
-$team_url = ereg_replace("\"", "'", $team->url);
-$team_description = ereg_replace("\"", "'", $team->description);
 $team_type = $team->type;
 page_head("Edit $team_name");
 team_edit_form($team, "Update team info", "team_edit_action.php");