diff --git a/register_participants_students.php b/register_participants_students.php
index 50389bc..77962df 100644
--- a/register_participants_students.php
+++ b/register_participants_students.php
@@ -276,7 +276,13 @@ else if($newstatus=="complete")
 		echo "</td><td>\n";
 			emit_month_selector("month[$x]",$month);
 		echo "</td><td>\n";
-			emit_year_selector("year[$x]",$year,date("Y")-19,date("Y")-10);
+
+		//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";
 	echo " <td>".i18n("Grade")."</td><td>\n";