diff --git a/plugins/calendar/TODO b/plugins/calendar/TODO
index 6646ce80..d75f67d4 100644
--- a/plugins/calendar/TODO
+++ b/plugins/calendar/TODO
@@ -30,8 +30,8 @@
 
 + Support for multiple calendars (replace categories)
 - Remember last visited view
-- Allow user to create/edit/delete calendars
-- Colors for calendars should be user-configurable
++ Allow user to create/edit/delete calendars
++ Colors for calendars should be user-configurable
 - ICS parser/generator ((http://code.google.com/p/qcal/)
 - Importing ICS files
 - Create/manage invdividual views
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index 6394849a..f230ddd7 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -365,8 +365,8 @@ class database_driver extends calendar_driver
       else {  // absolute timestamp
         $notify_at = $notify[0];
       }
-      
-      if ($notify_at > time())
+
+      if ($event['start'] > time())
         return date('Y-m-d H:i:s', $notify_at);
     }