diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index 38f0687e..938fd7d2 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -29,12 +29,14 @@
 	</tr><tr>
 	<th>Weight Category:</th><td>{{ workout.weightcategory }}</td>
 	</tr>
+        {% if user.is_authenticated %}
         <tr>
           <th>Comments</th>
         <td>
           <a href="/rowers/workout/{{ workout.id }}/comment">Comment</a>
         </td>
         </tr>
+        {% endif %}
 	</table>
 
 	<h1>Workout Summary</h1>
diff --git a/rowers/views.py b/rowers/views.py
index 56535b7f..cda72eec 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3341,12 +3341,12 @@ def workout_comment_view(request,id=0):
 	        res = handle_sendemailnewcomment.delay(r.user.first_name,
 					               r.user.last_name,
 					               r.user.email,
-                                                       c.user.first_name,
-                                                       c.user.last_name,
+                                                       request.user.first_name,
+                                                       request.user.last_name,
                                                        comment,w.name,
                                                        w.id)
 
-	    else:
+	    elif request.user != r.user:
 	        res = queuehigh.enqueue(handle_sendemailnewcomment,r.user.first_name,
 				    r.user.last_name,
 				    r.user.email,