diff --git a/important_dates.php b/important_dates.php
index 8715316d..3864b9df 100644
--- a/important_dates.php
+++ b/important_dates.php
@@ -26,8 +26,11 @@
  send_header("Important Dates",null,"important_dates");
 
  echo "<table>";
-
- $q=mysql_query("SELECT *,UNIX_TIMESTAMP(date) AS udate FROM dates WHERE year='{$config['FAIRYEAR']}' ORDER BY date");
+ if($conference['id']) {
+	 $q=mysql_query("SELECT *,UNIX_TIMESTAMP(date) AS udate FROM dates WHERE conferences_id='{$conference['id']}' ORDER BY date");
+ } else {
+	 $q=mysql_query("SELECT *,UNIX_TIMESTAMP(date) AS udate FROM dates WHERE year='{$config['FAIRYEAR']}' ORDER BY date");
+ }
  while($r=mysql_fetch_object($q))
  {
  	$trclass = ($trclass == 'odd') ? 'even' : 'odd';