diff --git a/admin/student_editor.php b/admin/student_editor.php
index e74fdf6..b93581c 100644
--- a/admin/student_editor.php
+++ b/admin/student_editor.php
@@ -24,7 +24,7 @@
 <?
  require_once('../common.inc.php');
  require_once('../user.inc.php');
- user_auth_required('committee', 'admin');
+ $auth_type = user_auth_required(array('fair','committee'), 'admin');
 
 $registrations_id = intval($_GET['id']);
 $action = $_GET['action'];
@@ -158,116 +158,113 @@ function students_load()
 	global $registrations_id;
 	global $config;
 
+	//now query and display 
+	$q=mysql_query("SELECT * F ROM students WHERE registrations_id='".$registrations_id."' AND year='".$config['FAIRYEAR']."'");
+	echo mysql_error();
+
+	$numfound=mysql_num_rows($q);
+
+	$numtoshow = intval($_GET['numstudents']);
+	if($numtoshow == 0) $numtoshow=$numfound;
 
 
-//now query and display
- $q=mysql_query("SELECT * FROM students WHERE registrations_id='".$registrations_id."' AND year='".$config['FAIRYEAR']."'");
- echo mysql_error();
+	echo "<form>";
+	echo i18n("Number of students that worked on the project: ");
+	echo "<select id=\"students_num\">\n";
+	for($x=$config['minstudentsperproject'];$x<=$config['maxstudentsperproject'];$x++) {
+		/* Don't let them go back to fewer student by selection, 
+		 * force them to delete one */
+		if($x<$numfound) continue;
 
-$numfound=mysql_num_rows($q);
+		$sel = ($numtoshow==$x) ? 'selected="selected"' : '';
+		echo "<option $sel value=\"$x\">$x</option>\n";
+	}
+	echo "</select>";
+	echo "</form>";
 
-$numtoshow = intval($_GET['numstudents']);
-if($numtoshow == 0) $numtoshow=$numfound;
+	echo "<form id=\"students_form\" >";
+	for($x=1;$x<=$numtoshow;$x++) {
+ 		$studentinfo=mysql_fetch_object($q);
+		echo "<h3>".i18n("Student %1 Details",array($x))."</h3>";
+		//if we have a valid student, set their ID, so we can UPDATE when we submit
+		//if there is no record for this student, then set the ID to 0, so we will INSERT when we submit
+		if($studentinfo->id) $id=$studentinfo->id; else $id=0;
 
+		//true should work here, it just has to be set to _something_ for it to work.
+		echo "<input type=\"hidden\" name=\"num[$x]\" value=\"true\" />";
 
- echo "<form>";
- echo i18n("Number of students that worked on the project: ");
- echo "<select id=\"students_num\">\n";
- for($x=$config['minstudentsperproject'];$x<=$config['maxstudentsperproject'];$x++) {
- 	/* Don't let them go back to fewer student by selection, 
-	 * force them to delete one */
- 	if($x<$numfound) continue;
+		//save the ID, or 0 if it doesnt exist
+		echo "<input type=\"hidden\" name=\"id[$x]\" value=\"$id\" />";
+		echo "<table>";
+		echo "<tr>\n";
+		echo " <td>".i18n("First Name")."</td><td><input type=\"text\" name=\"firstname[$x]\" value=\"$studentinfo->firstname\" />".REQUIREDFIELD."</td>\n";
+		echo " <td>".i18n("Last Name")."</td><td><input type=\"text\" name=\"lastname[$x]\" value=\"$studentinfo->lastname\" />".REQUIREDFIELD."</td>\n";
+		echo "</tr>\n";
 
-	$sel = ($numtoshow==$x) ? 'selected="selected"' : '';
-	echo "<option $sel value=\"$x\">$x</option>\n";
- }
- echo "</select>";
- echo "</form>";
+		if($config['participant_student_personal']=="yes") {
+			echo "<tr>\n";
+			echo " <td>".i18n("Gender")."</td><td>";
+			echo "<select name=\"sex[$x]\">";
+			echo "<option value=\"\">".i18n("Select")."</option>\n";
+			if($studentinfo->sex=="male") $sel="selected=\"selected\""; else $sel="";
+			echo "<option $sel value=\"male\">".i18n("Male")."</option>\n";
+			if($studentinfo->sex=="female") $sel="selected=\"selected\""; else $sel="";
+			echo "<option $sel value=\"female\">".i18n("Female")."</option>\n";
+			echo "</select>".REQUIREDFIELD;
+		}
+		echo "</td>\n";
+		echo " <td></td><td></td>\n";
+		echo "</tr>\n";
 
- echo "<form id=\"students_form\" >";
-for($x=1;$x<=$numtoshow;$x++) {
- 	$studentinfo=mysql_fetch_object($q);
-	echo "<h3>".i18n("Student %1 Details",array($x))."</h3>";
-	//if we have a valid student, set their ID, so we can UPDATE when we submit
-	//if there is no record for this student, then set the ID to 0, so we will INSERT when we submit
-	if($studentinfo->id) $id=$studentinfo->id; else $id=0;
+		echo "<tr>\n";
+		echo " <td>".i18n("Email Address")."</td><td><input type=\"text\" name=\"email[$x]\" value=\"$studentinfo->email\" />".REQUIREDFIELD."</td>\n";
 
-	//true should work here, it just has to be set to _something_ for it to work.
-	echo "<input type=\"hidden\" name=\"num[$x]\" value=\"true\" />";
+		if($config['participant_student_personal']=="yes")
+		{
+			echo " <td>".i18n("City")."</td><td><input type=\"text\" name=\"city[$x]\" value=\"$studentinfo->city\" />".REQUIREDFIELD."</td>\n";
+		} 
+		else
+		{
+			echo "<td></td>";
+		}
 
-	//save the ID, or 0 if it doesnt exist
-	echo "<input type=\"hidden\" name=\"id[$x]\" value=\"$id\" />";
-	echo "<table>";
-	echo "<tr>\n";
-	echo " <td>".i18n("First Name")."</td><td><input type=\"text\" name=\"firstname[$x]\" value=\"$studentinfo->firstname\" />".REQUIREDFIELD."</td>\n";
-	echo " <td>".i18n("Last Name")."</td><td><input type=\"text\" name=\"lastname[$x]\" value=\"$studentinfo->lastname\" />".REQUIREDFIELD."</td>\n";
-	echo "</tr>\n";
+		echo "</tr>\n";
 
-if($config['participant_student_personal']=="yes")
-{
-	echo "<tr>\n";
-	echo " <td>".i18n("Gender")."</td><td>";
-	echo "<select name=\"sex[$x]\">";
-	echo "<option value=\"\">".i18n("Select")."</option>\n";
-	if($studentinfo->sex=="male") $sel="selected=\"selected\""; else $sel="";
-	echo "<option $sel value=\"male\">".i18n("Male")."</option>\n";
-	if($studentinfo->sex=="female") $sel="selected=\"selected\""; else $sel="";
-	echo "<option $sel value=\"female\">".i18n("Female")."</option>\n";
-	echo "</select>".REQUIREDFIELD;
-}
-	echo "</td>\n";
-	echo " <td></td><td></td>\n";
-	echo "</tr>\n";
+		if($config['participant_student_personal']=="yes")
+		{
+			echo "<tr>\n";
+			echo " <td>".i18n("Address")."</td><td><input type=\"text\" name=\"address[$x]\" value=\"$studentinfo->address\" />".REQUIREDFIELD."</td>\n";
+			echo " <td>".i18n($config['provincestate'])."</td><td>";
+			emit_province_selector("province[$x]",$studentinfo->province);
+			echo REQUIREDFIELD."</td>\n";
+			echo "</tr>\n";
+			echo "<tr>\n";
+			echo " <td>".i18n($config['postalzip'])."</td><td><input type=\"text\" name=\"postalcode[$x]\" value=\"$studentinfo->postalcode\" />".REQUIREDFIELD."</td>\n";
+			echo " <td>".i18n("Phone")."</td><td><input type=\"text\" name=\"phone[$x]\" value=\"$studentinfo->phone\" />".REQUIREDFIELD."</td>\n";
+			echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo " <td>".i18n("Email Address")."</td><td><input type=\"text\" name=\"email[$x]\" value=\"$studentinfo->email\" />".REQUIREDFIELD."</td>\n";
+			echo "<tr>\n";
+			echo " <td>".i18n("Date of Birth")."</td><td>\n";
+			list($year,$month,$day)=split("-",$studentinfo->dateofbirth);
+			echo "<table><tr><td>";
+				emit_day_selector("day[$x]",$day);
+			echo "</td><td>\n";
+				emit_month_selector("month[$x]",$month);
+			echo "</td><td>\n";
 
-if($config['participant_student_personal']=="yes")
-{
-	echo " <td>".i18n("City")."</td><td><input type=\"text\" name=\"city[$x]\" value=\"$studentinfo->city\" />".REQUIREDFIELD."</td>\n";
-} 
-else
-{
-	echo "<td></td>";
-}
-
-	echo "</tr>\n";
-
-if($config['participant_student_personal']=="yes")
-{
-	echo "<tr>\n";
-	echo " <td>".i18n("Address")."</td><td><input type=\"text\" name=\"address[$x]\" value=\"$studentinfo->address\" />".REQUIREDFIELD."</td>\n";
-	echo " <td>".i18n($config['provincestate'])."</td><td>";
-	emit_province_selector("province[$x]",$studentinfo->province);
-	echo REQUIREDFIELD."</td>\n";
-	echo "</tr>\n";
-	echo "<tr>\n";
-	echo " <td>".i18n($config['postalzip'])."</td><td><input type=\"text\" name=\"postalcode[$x]\" value=\"$studentinfo->postalcode\" />".REQUIREDFIELD."</td>\n";
-	echo " <td>".i18n("Phone")."</td><td><input type=\"text\" name=\"phone[$x]\" value=\"$studentinfo->phone\" />".REQUIREDFIELD."</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo " <td>".i18n("Date of Birth")."</td><td>\n";
-	list($year,$month,$day)=split("-",$studentinfo->dateofbirth);
-		echo "<table><tr><td>";
-			emit_day_selector("day[$x]",$day);
-		echo "</td><td>\n";
-			emit_month_selector("month[$x]",$month);
-		echo "</td><td>\n";
-
-		//the year selector should be based on the min/max grades possible
-		//assume min age of 3 for grade=0 (kindergarden)
-		//assume max age of 18 for grade=12
-		$minyearselect=$config['FAIRYEAR'] - 6 - $config['maxgrade'];
-		$maxyearselect=$config['FAIRYEAR'] - 3 - $config['mingrade'];
+			//the year selector should be based on the min/max grades possible
+			//assume min age of 3 for grade=0 (kindergarden)
+			//assume max age of 18 for grade=12
+			$minyearselect=$config['FAIRYEAR'] - 6 - $config['maxgrade'];
+			$maxyearselect=$config['FAIRYEAR'] - 3 - $config['mingrade'];
 			emit_year_selector("year[$x]",$year,$minyearselect,$maxyearselect);
-		echo "</td><td>".REQUIREDFIELD."</td></tr></table>\n";
-	echo "</td>\n";
-}
-else
-	echo "<tr>";
+			echo "</td><td>".REQUIREDFIELD."</td></tr></table>\n";
+			echo "</td>\n";
+		}
+		else
+			echo "<tr>";
 
-	echo " <td>".i18n("Grade")."</td><td colspan=\"3\">\n";
+		echo " <td>".i18n("Grade")."</td><td colspan=\"3\">\n";
 
 		echo "<select name=\"grade[$x]\">\n";
 		echo "<option value=\"\">".i18n("Grade")."</option>\n";
@@ -279,106 +276,106 @@ else
 		}
 
 		echo "</select>\n";
-	echo REQUIREDFIELD."</td>";
-	echo "</tr>";
-
-	if($config['participant_student_tshirt']=="yes")
-	{
-		echo "<tr>\n";
-		echo " <td>".i18n("T-Shirt Size")."</td><td>";
-		echo "    <select name=\"tshirt[$x]\">\n";
-			if($studentinfo->tshirt=="none") $sel="selected=\"selected\""; else $sel="";
-		echo "		<option $sel value=\"none\">".i18n("None")."</option>";
-			if($studentinfo->tshirt=="small") $sel="selected=\"selected\""; else $sel="";
-		echo "		<option $sel value=\"small\">".i18n("Small")."</option>";
-			if($studentinfo->tshirt=="medium") $sel="selected=\"selected\""; else $sel="";
-		echo "		<option $sel value=\"medium\">".i18n("Medium")."</option>";
-			if($studentinfo->tshirt=="large") $sel="selected=\"selected\""; else $sel="";
-		echo "		<option $sel value=\"large\">".i18n("Large")."</option>";
-			if($studentinfo->tshirt=="xlarge") $sel="selected=\"selected\""; else $sel="";
-		echo "		<option $sel value=\"xlarge\">".i18n("X-Large")."</option>";
-		echo " </select>";
-		echo "</td>\n";
+		echo REQUIREDFIELD."</td>";
 		echo "</tr>";
-	}
 
-if($config['participant_student_personal']=="yes")
-{
-	echo "<tr>\n";
-	echo "<td>".i18n("Medical Alert Info")."</td><td colspan=\"3\">";
-	echo "<input name=\"medicalalert[$x]\" type=\"text\" size=\"50\" value=\"$studentinfo->medicalalert\" />";
-	echo "</td>";
-	echo "</tr>\n";
-}
-
-	if($config['participant_student_foodreq']=="yes")
-	{
-		echo "<tr>\n";
-		echo "<td>".i18n("Special Food Requirements")."</td><td colspan=\"3\">";
-		echo "<input name=\"foodreq[$x]\" type=\"text\" size=\"50\" value=\"$studentinfo->foodreq\" />";
-		echo "</td>";
-		echo "</tr>\n";
-	}
-
-	echo "<tr>\n";
-	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,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($config['participant_student_tshirt']=="yes")
 		{
-			if($studentinfo->schools_id==$r->id) $sel="selected=\"selected\""; else $sel="";
-			echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->city).' - '.htmlspecialchars($r->school)."</option>\n";
-				
+			echo "<tr>\n";
+			echo " <td>".i18n("T-Shirt Size")."</td><td>";
+			echo "    <select name=\"tshirt[$x]\">\n";
+				if($studentinfo->tshirt=="none") $sel="selected=\"selected\""; else $sel="";
+			echo "		<option $sel value=\"none\">".i18n("None")."</option>";
+				if($studentinfo->tshirt=="small") $sel="selected=\"selected\""; else $sel="";
+			echo "		<option $sel value=\"small\">".i18n("Small")."</option>";
+				if($studentinfo->tshirt=="medium") $sel="selected=\"selected\""; else $sel="";
+			echo "		<option $sel value=\"medium\">".i18n("Medium")."</option>";
+			if($studentinfo->tshirt=="large") $sel="selected=\"selected\""; else $sel="";
+			echo "		<option $sel value=\"large\">".i18n("Large")."</option>";
+				if($studentinfo->tshirt=="xlarge") $sel="selected=\"selected\""; else $sel="";
+			echo "		<option $sel value=\"xlarge\">".i18n("X-Large")."</option>";
+			echo " </select>";
+			echo "</td>\n";
+			echo "</tr>";
 		}
-		echo "</select>".REQUIREDFIELD;
+
+		if($config['participant_student_personal']=="yes")
+		{
+			echo "<tr>\n";
+			echo "<td>".i18n("Medical Alert Info")."</td><td colspan=\"3\">";
+			echo "<input name=\"medicalalert[$x]\" type=\"text\" size=\"50\" value=\"$studentinfo->medicalalert\" />";
+			echo "</td>";
+			echo "</tr>\n";
+		}
+
+		if($config['participant_student_foodreq']=="yes")
+		{
+			echo "<tr>\n";
+			echo "<td>".i18n("Special Food Requirements")."</td><td colspan=\"3\">";
+			echo "<input name=\"foodreq[$x]\" type=\"text\" size=\"50\" value=\"$studentinfo->foodreq\" />";
+			echo "</td>";
+			echo "</tr>\n";
+		}
+
+		echo "<tr>\n";
+		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,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->city).' - '.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 "</td>\n";
+		echo "</tr>\n";
+
+		echo "<tr>\n";
+		echo " <td>".i18n("Teacher Name")."</td><td><input type=\"text\" name=\"teachername[$x]\" value=\"$studentinfo->teachername\" /></td>\n";
+		echo " <td>".i18n("Teacher Email")."</td><td><input type=\"text\" name=\"teacheremail[$x]\" value=\"$studentinfo->teacheremail\" /></td>\n";
+		echo "</tr>\n";
+
+
+
+
+		echo "</table>";
+
+		if($numfound>$config['minstudentsperproject'] && $studentinfo->id)
+		{
+			/* Create a hidden with same id as the button and some extra, so we can find it inside
+			 * the button even with: this.id"+_studebts_id" */
+			echo "<input type=\"hidden\" id=\"students_remove_{$studentinfo->id}_students_id\" name=\"students_remove[]\" value=\"{$studentinfo->id}\" />";
+
+			/* Define the button */
+			echo "<div align=\"right\"><button id=\"students_remove_{$studentinfo->id}\" class=\"students_remove_button\" >";
+			echo "<img style=\"vertical-align:middle\" src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\" border=0>";
+			echo "&nbsp;&nbsp;".i18n("Remove this student from project");
+			echo "</button></div>";
+
+			echo "<br/><hr/>";
+		}
+
+		echo "<br />";
+		echo "<br />";
 	}
-	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 "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo " <td>".i18n("Teacher Name")."</td><td><input type=\"text\" name=\"teachername[$x]\" value=\"$studentinfo->teachername\" /></td>\n";
-	echo " <td>".i18n("Teacher Email")."</td><td><input type=\"text\" name=\"teacheremail[$x]\" value=\"$studentinfo->teacheremail\" /></td>\n";
-	echo "</tr>\n";
-
-
-
-
-	echo "</table>";
-
-	if($numfound>$config['minstudentsperproject'] && $studentinfo->id)
-	{
-		/* Create a hidden with same id as the button and some extra, so we can find it inside
-		 * the button even with: this.id"+_studebts_id" */
-		echo "<input type=\"hidden\" id=\"students_remove_{$studentinfo->id}_students_id\" name=\"students_remove[]\" value=\"{$studentinfo->id}\" />";
-
-		/* Define the button */
-		echo "<div align=\"right\"><button id=\"students_remove_{$studentinfo->id}\" class=\"students_remove_button\" >";
-		echo "<img style=\"vertical-align:middle\" src=\"".$config['SFIABDIRECTORY']."/images/16/button_cancel.".$config['icon_extension']."\" border=0>";
-		echo "&nbsp;&nbsp;".i18n("Remove this student from project");
-		echo "</button></div>";
-
-		echo "<br/><hr/>";
-	}
-
 	echo "<br />";
+	echo i18n("WARNING! If you make a change to the grade that would affect the project number, you must update the project number manually, it will NOT be automatically updated");
+	echo "<br />";
+	echo "<input type=\"button\" id=\"students_save\" value=\"".i18n("Save Student Information")."\" />\n";
+	echo "</form>";
 	echo "<br />";
- }
-echo "<br />";
-echo i18n("WARNING! If you make a change to the grade that would affect the project number, you must update the project number manually, it will NOT be automatically updated");
-echo "<br />";
- echo "<input type=\"button\" id=\"students_save\" value=\"".i18n("Save Student Information")."\" />\n";
- echo "</form>";
- echo "<br />";
 }