diff --git a/rowers/models.py b/rowers/models.py
index 7c73793d..6c03718a 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1444,7 +1444,7 @@ class Alert(models.Model):
         default=False, null=True, verbose_name='Include Rest Strokes')
     period = models.IntegerField(
         default=7, verbose_name='Reporting Period (days)')
-    next_run = models.DateField(default=timezone.now)
+    next_run = models.DateField(default=current_day)
     emailalert = models.BooleanField(
         default=True, verbose_name='Send email alerts')
     workouttype = models.CharField(choices=rowchoices, max_length=50,
@@ -1453,8 +1453,8 @@ class Alert(models.Model):
                                 verbose_name='Boat Type', default='1x')
 
     def save(self, *args, **kwargs):
-        if self.next_run > datetime.date.today()+datetime.timedelta(days=self.period):
-            self.next_run = datetime.date.today()+datetime.timedelta(days=self.period)
+        if self.next_run > (timezone.now()+datetime.timedelta(days=self.period)).date():
+            self.next_run = (timezone.now()+datetime.timedelta(days=self.period)).date()
         super(Alert, self).save(*args, **kwargs)