diff --git a/admin/judges_teams_projects.php b/admin/judges_teams_projects.php
index 041df01..1969055 100644
--- a/admin/judges_teams_projects.php
+++ b/admin/judges_teams_projects.php
@@ -209,9 +209,8 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
 					projects,
 					registrations
 				WHERE
-					projectnumber is not null AND
-					(registrations.status='complete' OR
-					registrations.status='paymentpending' ) AND
+					projectnumber is not null 
+					" . getJudgingEligibilityCode(). " AND
 					projects.registrations_id=registrations.id AND
 					projects.year='".$config['FAIRYEAR']."'
 				ORDER BY
@@ -229,9 +228,8 @@ if( ($action=="edit" || $action=="assign" ) && $edit)
 					LEFT JOIN judges_teams_timeslots_projects_link ON projects.id = judges_teams_timeslots_projects_link.projects_id, 
 					registrations
 				WHERE
-					projectnumber is not null AND
-					(registrations.status='complete' OR
-					registrations.status='paymentpending' ) AND
+					projectnumber is not null 
+					" . getJudgingEligibilityCode(). " AND
 					projects.registrations_id=registrations.id AND
 					judges_teams_timeslots_projects_link.projects_id IS NULL AND
 					projects.year='".$config['FAIRYEAR']."'