diff --git a/register_participants_emergencycontact.php b/register_participants_emergencycontact.php
new file mode 100644
index 0000000..f89c48f
--- /dev/null
+++ b/register_participants_emergencycontact.php
@@ -0,0 +1,142 @@
+<?
+ require("common.inc.php");
+ include "register_participants.inc.php";
+ 
+ //authenticate based on email address and registration number from the SESSION
+ if(!$_SESSION['email'])
+ {
+ 	header("Location: register_participants.php");
+	exit;
+ }
+ if(!$_SESSION['registration_number'])
+ {
+ 	header("Location: register_participants.php");
+	exit;
+ }
+
+ $q=mysql_query("SELECT registrations.id AS regid, students.id AS studentid, students.firstname FROM registrations,students ".
+ 	"WHERE students.email='".$_SESSION['email']."' ".
+	"AND registrations.num='".$_SESSION['registration_number']."' ". 
+	"AND registrations.id='".$_SESSION['registration_id']."' ".
+	"AND students.registrations_id=registrations.id ".
+	"AND registrations.year=".$config['FAIRYEAR']." ".
+	"AND students.year=".$config['FAIRYEAR']);
+echo mysql_error();
+
+ if(mysql_num_rows($q)==0)
+ {
+ 	header("Location: register_participants.php");
+	exit;
+ 
+ }
+ $authinfo=mysql_fetch_object($q);
+
+ //send the header
+ send_header("Participant Registration - Emergency Contact Information");
+
+ echo "<a href=\"register_participants_main.php\">&lt;&lt; ".i18n("Back to Participant Registration Summary")."</a><br />";
+ echo "<br />";
+
+ $studentstatus=studentStatus();
+ if($studentstatus!="complete")
+ {
+	echo error(i18n("Please complete the <a href=\"register_participants_students.php\">Student Information Page</a> first"));
+	send_footer();
+	exit;
+ }
+
+
+ if($_POST['action']=="save")
+ {
+ 	//first, lets make sure this emergency contact really does belong to them
+	foreach($_POST['ids'] AS $id)
+	{
+		$q=mysql_query("SELECT * FROM emergencycontact WHERE id='$id' AND registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'");
+		if(mysql_num_rows($q)==1)
+		{
+			mysql_query("UPDATE emergencycontact SET ".
+					"firstname='".mysql_escape_string(stripslashes($_POST['firstname'][$id]))."', ".
+					"lastname='".mysql_escape_string(stripslashes($_POST['lastname'][$id]))."', ".
+					"relation='".mysql_escape_string(stripslashes($_POST['relation'][$id]))."', ".
+					"phone1='".mysql_escape_string(stripslashes($_POST['phone1'][$id]))."', ".
+					"phone2='".mysql_escape_string(stripslashes($_POST['phone2'][$id]))."', ".
+					"phone3='".mysql_escape_string(stripslashes($_POST['phone3'][$id]))."', ".
+					"phone4='".mysql_escape_string(stripslashes($_POST['phone4'][$id]))."', ".
+					"email='".mysql_escape_string(stripslashes($_POST['email'][$id]))."' ".
+					"WHERE id='$id'");
+					echo mysql_error();
+			echo notice(i18n("Emergency contact information successfully updated"));
+		}
+		else
+		{
+			echo error(i18n("Invalid emergency contact to update (%1)"),array($id));
+		}
+	}
+ }
+
+
+
+//output the current status
+$newstatus=emergencycontactStatus();
+if($newstatus!="complete")
+{
+	echo error(i18n("Emergency Contact Information Incomplete"));
+}
+else if($newstatus=="complete")
+{
+	echo happy(i18n("Emergency Contact Information Complete"));
+
+}
+
+$sq=mysql_query("SELECT id,firstname,lastname FROM students WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'");
+$numstudents=mysql_num_rows($sq);
+
+echo "<form name=\"emergencycontactform\" method=\"post\" action=\"register_participants_emergencycontact.php\">\n";
+echo "<input type=\"hidden\" name=\"action\" value=\"save\">\n";
+
+while($sr=mysql_fetch_object($sq))
+{
+	$q=mysql_query("SELECT * FROM emergencycontact WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."' AND students_id='$sr->id'");
+
+	if(mysql_num_rows($q)==0)
+	{
+		mysql_query("INSERT INTO emergencycontact (registrations_id,students_id,year) VALUES ('".$_SESSION['registration_id']."','".$sr->id."','".$config['FAIRYEAR']."')");
+		$id=mysql_insert_id();
+		unset($r);
+	}
+	else
+	{
+		$r=mysql_fetch_object($q);
+		$id=$r->id;
+	}
+
+	echo "<h3>".i18n("Emergency Contact for %1 %2",array($sr->firstname,$sr->lastname))."</h3>";
+	echo "<input type=\"hidden\" name=\"ids[]\" value=\"$id\">";
+	echo "<table>\n";
+	echo "<tr>";
+	echo " <td>".i18n("First Name").": </td><td><input type=\"text\" name=\"firstname[$id]\" size=\"20\" value=\"$r->firstname\" /></td>";
+	echo " <td>".i18n("Last Name").": </td><td><input type=\"text\" name=\"lastname[$id]\" size=\"20\" value=\"$r->lastname\" /></td>";
+	echo "</tr>\n";
+	echo "<tr>";
+	echo " <td>".i18n("Relation").": </td><td><input type=\"text\" name=\"relation[$id]\" size=\"20\" value=\"$r->relation\" /></td>";
+	echo " <td>".i18n("Email Address").": </td><td><input type=\"text\" name=\"email[$id]\" size=\"20\" value=\"$r->email\" /></td>";
+	echo "</tr>\n";
+	echo "<tr>";
+	echo " <td>".i18n("Phone 1").": </td><td><input type=\"text\" name=\"phone1[$id]\" size=\"20\" value=\"$r->phone1\" /></td>";
+	echo " <td>".i18n("Phone 2").": </td><td><input type=\"text\" name=\"phone2[$id]\" size=\"20\" value=\"$r->phone2\" /></td>";
+	echo "</tr>\n";
+	echo "<tr>";
+	echo " <td>".i18n("Phone 3").": </td><td><input type=\"text\" name=\"phone3[$id]\" size=\"20\" value=\"$r->phone3\" /></td>";
+	echo " <td>".i18n("Phone 4").": </td><td><input type=\"text\" name=\"phone4[$id]\" size=\"20\" value=\"$r->phone4\" /></td>";
+	echo "</tr>\n";
+	echo "</table>";
+	echo "<br />";
+	echo "<br />";
+
+ }
+ echo "<input type=\"submit\" value=\"".i18n("Save Emergency Contact Information")."\" />\n";
+ echo "</form>";
+
+
+ send_footer();
+?>
diff --git a/register_participants_students.php b/register_participants_students.php
index 5640a74..fae1f55 100644
--- a/register_participants_students.php
+++ b/register_participants_students.php
@@ -109,6 +109,14 @@ if($_GET['action']=="removestudent")
 	if(mysql_num_rows($q)==1)
 	{
 		mysql_query("DELETE FROM students WHERE id='".$_GET['removestudent']."' AND registrations_id='".$_SESSION['registration_id']."'");
+
+		//now see if they have an emergency contact that also needs to be removed
+
+		$q=mysql_query("SELECT id FROM emergencycontact WHERE students_id='".$_GET['removestudent']."' AND registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'");
+		//no need to error message if this doesnt exist
+		if(mysql_num_rows($q)==1)
+			mysql_query("DELETE FROM emergencycontact WHERE students_id='".$_GET['removestudent']."' AND registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'");
+
 		echo notice(i18n("Student successfully removed"));
 	}
 	else