diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html
index 24510a1d..9920b63b 100644
--- a/rowers/templates/plannedsessionview.html
+++ b/rowers/templates/plannedsessionview.html
@@ -145,7 +145,7 @@
       </p>
       {% endfor %}
       <p>
-        <a href="/rowers/sessions/{{ race.id }}/comments/">Add a comment</a>
+        <a href="/rowers/sessions/{{ psdict.id.1 }}/comments/">Add a comment</a>
       </p>
     </div>
   </li>
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 36e5640a..7f503c9a 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index f4d43afa..ad62f109 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -71,6 +71,23 @@ def plannedsession_comment_view(request,id=0,userid=0):
             )
                 
             commenters = {oc.user for oc in comments if oc.notification}
+            if ps.sessiontype=='race':
+                registrations = VirtualRaceResult.objects.filter(
+                    race__id=ps.id,
+                    emailnotifications=True)
+                ids = [r.user.userid or r in registrations]
+                usrs = User.objects.filter(id in ids)
+                rowers = {u for u in usrs}
+            elif ps.sessiontype=='indoorrace':
+                registrations = IndoorVirtualRaceResult.objects.filter(
+                    race__id=ps.id,
+                    emailnotifications=True)
+                ids = [r.user.userid or r in registrations]
+                usrs = User.objects.filter(id in ids)
+                rowers = {u for u in usrs}
+            else:
+                rowers = {r.user for r in ps.rower.all()}
+            commenters = set(list(commenters)+list(rowers))
             for u in commenters:
                 a_messages.info(u,message)
                 if u != request.user and u != r.user: