diff --git a/register_participants_students.php b/register_participants_students.php
index 9d2aa088..50389bcc 100644
--- a/register_participants_students.php
+++ b/register_participants_students.php
@@ -329,16 +329,25 @@ else if($newstatus=="complete")
 
 	echo "<tr>\n";
 	echo " <td>".i18n("School")."</td><td colspan=\"3\">";
-	$schoolq=mysql_query("SELECT id,school FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER by school");
-	echo "<select name=\"schools_id[$x]\">\n";
-	echo "<option value=\"\">".i18n("Choose School")."</option>\n";
-	while($r=mysql_fetch_object($schoolq))
+	if($config['participant_registration_type']=="open" || $config['participant_registration_type']=="singlepassword" )
 	{
-		if($studentinfo->schools_id==$r->id) $sel="selected=\"selected\""; else $sel="";
-		echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->school)."</option>\n";
-			
+		$schoolq=mysql_query("SELECT id,school FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER by 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 "</select>".REQUIREDFIELD;
+	}
+	else
+	{
+		$schoolq=mysql_query("SELECT id,school FROM schools WHERE year='".$config['FAIRYEAR']."' AND id='$studentinfo->schools_id'");
+		$r=mysql_fetch_object($schoolq);
+		echo $r->school;
 	}
-	echo "</select>".REQUIREDFIELD;
 
 	echo "</td>\n";
 	echo "</tr>\n";