diff --git a/rowers/models.py b/rowers/models.py
index 9caf9810..4c26ccd7 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1072,10 +1072,12 @@ class Alert(models.Model):
     
 
     def __str__(self):
-        stri = u'Alert {name} on {metric} for {workouttype}'.format(
+        stri = u'Alert {name} on {metric} for {workouttype} - running on {first_name} every {period} days'.format(
             name = self.name,
             metric = self.measured.metric,
-            workouttype = self.workouttype
+            workouttype = self.workouttype,
+            first_name = self.rower.user.first_name,
+            period = self.period,
             )
 
         return stri
diff --git a/rowers/templates/alert_create.html b/rowers/templates/alert_create.html
index d7b1c57a..846dd086 100644
--- a/rowers/templates/alert_create.html
+++ b/rowers/templates/alert_create.html
@@ -30,7 +30,7 @@
 <form action="" method="post">
   <ul class="main-content">
     <li class="grid_2">
-      <h2>Alert</h2>
+      <h2>New Alert for {{ rower.user.first_name }}</h2>
       <p>
 	{{ formset.management_form }}
         {% csrf_token %}
diff --git a/rowers/templates/alert_edit.html b/rowers/templates/alert_edit.html
index 081d9a36..c5442ccb 100644
--- a/rowers/templates/alert_edit.html
+++ b/rowers/templates/alert_edit.html
@@ -28,7 +28,7 @@
 <form action="" method="post">
   <ul class="main-content">
     <li class="grid_2">
-      <h2>Alert</h2>
+      <h2>Alert {{ alert.name }} for {{ alert.rower.user.first_name }}</h2>
       <p>
 	{{ formset.management_form }}
         {% csrf_token %}
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 546fb652..ff142a34 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4577,6 +4577,7 @@ def alert_edit_view(request,id=0,userid=0):
                       'form':form,
                       'measuredform':measuredform,
                       'formset':filter_formset,
+                      'alert':alert,
                       })
 
 # alert delete view