diff --git a/admin/student_editor.php b/admin/student_editor.php
index a4efa689..e74fdf6b 100644
--- a/admin/student_editor.php
+++ b/admin/student_editor.php
@@ -440,7 +440,11 @@ function registration_load()
 				echo "<option $sel value=\"$k\">$v</option>";
 			} 
 ?>			</select></td>
-	</tr><tr>
+	</tr>
+<?
+if(count($fairs)>0) {	
+?>	
+	 <tr>
 		<td><?=i18n("Fair")?>:</td>
 		<td><select name="registration_fair">
 			<option value="0"><?=i18n('Independent/None')?></option>
@@ -448,8 +452,17 @@ function registration_load()
 				$sel = ($fid == $r['fairs_id']) ? 'selected="selected"' : '';
 				echo "<option $sel value=\"$fid\">{$f['name']}</option>";
 			} 
-?>			</select></td>
-	</tr></table>
+?>			
+		</select>
+     </td>
+	</tr>
+<?
+}
+else {
+	echo "<input type=\"hidden\" name=\"registration_fair\" value=\"0\" />\n";
+}
+?>
+	</table>
 	<br /><br />
 	<button id="registration_save"><?=i18n('Save Registration Information')?></button>
 	</form>