diff --git a/admin/judges_teams.php b/admin/judges_teams.php
index ab902506..5a8b3703 100644
--- a/admin/judges_teams.php
+++ b/admin/judges_teams.php
@@ -67,7 +67,7 @@ function saveteamnamesbuttonclicked()
 		else
 		{
 			echo notice(i18n("Creating new team #%1",array($_POST['team_num'])));
-			mysql_query("INSERT INTO judges_teams (num,year) VALUES ('".$_POST['team_num']."','".$config['FAIRYEAR']."')");
+			mysql_query("INSERT INTO judges_teams (num,name,year) VALUES ('".$_POST['team_num']."','".$_POST['team_name']."','".$config['FAIRYEAR']."')");
 			$team_id=mysql_insert_id();
 		}
 
@@ -196,6 +196,7 @@ function saveteamnamesbuttonclicked()
 				judges_teams_link.judges_id=judges.id AND
 				judges_teams_link.judges_teams_id=judges_teams.id
 			ORDER BY 
+				name,
 				num,
 				lastname,
 				firstname");
@@ -228,7 +229,7 @@ function saveteamnamesbuttonclicked()
 	echo "</td><td>";
 
 	echo "<table>";
-	echo "<tr><th align=\"left\">New Team #$newteamid</th></tr>";
+	echo "<tr><th align=\"left\">New #$newteamid: <input type=\"text\" name=\"team_name\" value=\"Team #$newteamid\" /></th></tr>";
 	echo "</table>";
 
 	echo "</td></tr></table>";