diff --git a/admin/student_editor.php b/admin/student_editor.php
index c64abe4..70a1a12 100644
--- a/admin/student_editor.php
+++ b/admin/student_editor.php
@@ -328,13 +328,13 @@ if($config['participant_student_personal']=="yes")
 	echo " <td>".i18n("School")."</td><td colspan=\"3\">";
 	if( $config['participant_registration_type']=="open" || $config['participant_registration_type']=="singlepassword" || ($studentinfo && !$studentinfo->schools_id) )
 	{
-		$schoolq=mysql_query("SELECT id,school FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER by school");
+		$schoolq=mysql_query("SELECT id,school,city FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER by city,school");
 		echo "<select name=\"schools_id[$x]\">\n";
 		echo "<option value=\"\">".i18n("Choose School")."</option>\n";
 		while($r=mysql_fetch_object($schoolq))
 		{
 			if($studentinfo->schools_id==$r->id) $sel="selected=\"selected\""; else $sel="";
-			echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->school)."</option>\n";
+			echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->city).' - '.htmlspecialchars($r->school)."</option>\n";
 				
 		}
 		echo "</select>".REQUIREDFIELD;