diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 354a4842..7a1d58ea 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -62,7 +62,7 @@
         <td> {{ workout.date |truncatechars:15}} </td>
         <td> {{ workout.starttime }} </td>
         <td>
-          {% if workout.user.user == user %}
+          {% if workout.user.user == user or user == team.manager %}
           {% if workout.name != '' %}
           <a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td>
         {% else %}
diff --git a/rowers/views.py b/rowers/views.py
index 88d9fa30..0a5aa3d1 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -302,7 +302,8 @@ def sendmail(request):
 def checkworkoutuser(user,workout):
     try:
 	r = Rower.objects.get(user=user)
-	return (workout.user == r)
+        managers = [team.manager for team in workout.team.all()]
+	return (workout.user == r or user in managers)
     except Rower.DoesNotExist:
 	return(False)