diff --git a/participant_invite.php b/participant_invite.php
index bda506ef..4ca3be54 100644
--- a/participant_invite.php
+++ b/participant_invite.php
@@ -204,14 +204,13 @@ if( ($_POST['action']=="invitenew" || $_POST['action']=="inviteexisting") && $_P
  echo "</form>\n";
 
  if($_SESSION['superuser']=="yes") {
-	 $q=mysql_query("SELECT users.id, users.firstname, users.lastname, accounts.username, accounts.email, accounts.pendingemail, users.schools_id, schools.school 
+	 $q=mysql_query("SELECT users.id, users.firstname, users.lastname, accounts.username, accounts.email, accounts.pendingemail, users.schools_id, schools.school, schools.conferences_id 
 	 FROM users
 	 LEFT JOIN schools ON users.schools_id=schools.id
 	 JOIN accounts on users.accounts_id=accounts.id 
 	 JOIN user_roles ON user_roles.users_id=users.id
 	 JOIN roles ON user_roles.roles_id=roles.id
 	 AND users.conferences_id='{$conference['id']}'
-	 AND schools.conferences_id='{$conference['id']}'
 	 AND roles.type='participant'");
  }
  else {
@@ -254,7 +253,10 @@ if( ($_POST['action']=="invitenew" || $_POST['action']=="inviteexisting") && $_P
 	 echo " <td>$r->firstname</td>";
 	 echo " <td>$r->lastname</td>";
 	 if($_SESSION['superuser']=="yes") {
-		 echo "<td>$r->school</td>";
+		 echo "<td>$r->school";
+		 if($r->conferences_id!=$conference['id'] && $r->schools_id)
+			 echo error("invalid school for this conference");
+		 echo "</td>";
 	 }
 
 	 echo " <td><a href=\"#\" onclick=\"return uninvite($r->id)\">uninvite</a></td>";