diff --git a/register_participants_namecheck.php b/register_participants_namecheck.php
index af2fab4..61beb16 100644
--- a/register_participants_namecheck.php
+++ b/register_participants_namecheck.php
@@ -38,7 +38,7 @@
 	exit;
  }
 
- $q=mysql_query("SELECT * FROM students WHERE id='{$_SESSION['students_id']}'");
+ $q=mysql_query("SELECT * FROM students WHERE registrations_id='{$_SESSION['registration_id']}'");
  echo mysql_error();
 
  if(mysql_num_rows($q)==0)
@@ -47,8 +47,8 @@
 	exit;
  
  }
- $s=mysql_fetch_object($q);
- $student_display_name = "{$s->firstname} {$s->lastname}";
+ while($s=mysql_fetch_object($q))
+	 $student_display_name[] = "{$s->firstname} {$s->lastname}";
 
  //send the header
  send_header("Participant Registration - Check Your Name");
@@ -67,11 +67,11 @@
 
 		if($sp && $ca && $pu) {
 			if($s->namecheck_complete!='yes') {
-				$q=mysql_query("UPDATE students SET namecheck_complete='yes' WHERE id='{$_SESSION['students_id']}'");
+				$q=mysql_query("UPDATE students SET namecheck_complete='yes' WHERE registrations_id='{$_SESSION['registration_id']}'");
 				$s->namecheck_complete = 'yes';
 			}
 		} else if($s->namecheck_complete!='no') {
-			$q=mysql_query("UPDATE students SET namecheck_complete='no' WHERE id='{$_SESSION['students_id']}'");
+			$q=mysql_query("UPDATE students SET namecheck_complete='no' WHERE registrations_id='{$_SESSION['registration_id']}'");
 			$s->namecheck_complete = 'no';
 		}
 	}
@@ -94,10 +94,8 @@ else if($newstatus=="complete")
  difficult to re-print certificates and even harder to re-engrave a plaque.');
  echo '<br /><br />';
  echo i18n('Your name is in the box below.  (If you have a partner, your
- partner can view his/her name by logging in to the participant registration
- using his/her email address and the same registration number).  This is 
- EXACTLY how your name will appear on any certificates, awards, or
- engraving.');
+ partners name is also shown below).  This is EXACTLY how your name will appear 
+ on any certificates, awards, or engraving.');
  echo '<br /><br />';
  echo i18n('Just to clarify, EXACTLY means EXACTLY.  We will not add upper-case
  letters if you typed your name in all lower-case.  We will not change letters
@@ -106,7 +104,8 @@ else if($newstatus=="complete")
  the %1Student Information%2 page and correct it. ', array(
  	'<a href="register_participants_students.php">', '</a>'));
  echo '<br /><br />';
- echo "<table class=\"summarytable\"><tr><td><span style=\"font-size: 4.0em; font-weight: bold\">&nbsp;$student_display_name&nbsp;</span></td></tr></table>";
+ foreach($student_display_name AS $sn) 
+	 echo "<table class=\"summarytable\"><tr><td><span style=\"font-size: 4.0em; font-weight: bold\">&nbsp;$sn&nbsp;</span></td></tr></table>";
  echo '<br /><br />';
  echo i18n('Please confirm that:');
  echo '<br />';