diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index 789eb3c5..298577e6 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -306,7 +306,7 @@ function copyText() {
       }
     </script>
   </li>
-  {% if user.is_authenticated and user == workout.user.user %}
+  {% if user.is_authenticated and workout|may_edit:request %}
   <li class="grid_4">
     <input type="checkbox" name="lock" id="lock" value="Lock">Lock Data and Video
   </li>
@@ -322,7 +322,7 @@ function copyText() {
     <li class="grid_2">
 
 
-      {% if form and user.is_authenticated and user == workout.user.user %}
+      {% if form and user.is_authenticated and workout|may_edit:request %}
 
       <table>
         {{ form.as_table }}
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 6e7b8545..e113f19d 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -172,6 +172,9 @@ def workout_video_create_view(request,id=0):
     else:
         mode = 'erg'
 
+
+    mayedit = checkworkoutuser(request.user,w) and isprorower(request.user.rower)
+
     # get video ID and offset
     if request.method == 'POST':
         form = VideoAnalysisCreateForm(request.POST)