diff --git a/register_participants_students.php b/register_participants_students.php
index 7bb4a080..02b68ce8 100644
--- a/register_participants_students.php
+++ b/register_participants_students.php
@@ -430,7 +430,11 @@ if($config['participant_student_personal']=="yes")
 		echo "<option value=\"\">".i18n("Choose School")."</option>\n";
 		while($r=mysql_fetch_object($schoolq))
 		{
-			if($studentinfo->schools_id==$r->id || $lastSchool ==$r->id) $sel="selected=\"selected\""; else $sel="";
+			if($studentinfo->schools_id==$r->id || (!$studentinfo->schools_id && $lastSchool ==$r->id)) {
+				$sel="selected=\"selected\""; 
+			} else {
+				$sel="";
+			}
 			echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->city).' - '.htmlspecialchars($r->school)."</option>\n";
 				
 		}