diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index cf3c36d3..5740f53a 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -646,8 +646,7 @@ def add_workout_race(ws,race,r):
 
 
 
-    wold = Workout.objects.filter(plannedsession=race,user=r)
-    ids = [w.id for w in wold] + [w.id for w in ws]
+    ids = [w.id for w in ws]
     ids = list(set(ids))
 
     if len(ids)>1 and race.sessiontype in ['test','coursetest']:
@@ -664,6 +663,7 @@ def add_workout_race(ws,race,r):
             comments.append('Your result has been submitted')
         else:
             errors.append('Workout %i did not match the race window' % w.id)
+            return result,comments,errors
 
     if result>0:
         username = r.user.first_name+' '+r.user.last_name
@@ -678,6 +678,7 @@ def add_workout_race(ws,race,r):
         ) = courses.get_time_course(ws,race.course)
         if not coursecompleted:
             errors.append('Your trajectory did not match the race course')
+            return result,comments,errors
 
         duration = totaltime_sec_to_string(coursetime)
             
diff --git a/rowers/templates/race_submit.html b/rowers/templates/race_submit.html
index e8678c04..b51538b0 100644
--- a/rowers/templates/race_submit.html
+++ b/rowers/templates/race_submit.html
@@ -28,10 +28,7 @@
       method="post">
 <div class="grid_12 alpha">
   <div class="grid_6 alpha">
-    <p>&nbsp;</p>
-  </div>
-  <div class="grid_6 omega">
-    <p>Workouts</p>
+    <p>Select one of the following workouts that you rowed within the race window</p>
     <table width="100%">
       <tr>
       {% for field in w_form.hidden_fields %}
diff --git a/rowers/views.py b/rowers/views.py
index 182f0640..a53456ff 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11514,7 +11514,6 @@ def rower_edit_view(request,rowerid=0,message=""):
             r.sex = sex
             r.birthdate = birthdate
             if resetbounce and r.emailbounced:
-                print "aap"
                 r.emailbounced = False
             r.save()
             form = RowerForm(instance=r)
@@ -13661,22 +13660,21 @@ def virtualevent_submit_result_view(request,id=0):
         w_form = WorkoutRaceSelectForm(workoutdata,request.POST)
 
         if w_form.is_valid():
-            selectedworkouts = [w_form.cleaned_data['workouts']]
+            selectedworkout = w_form.cleaned_data['workouts']
         else:
-            selectedworkouts = []
+            selectedworkout = None
+
+
+        for w in ws:
+            remove_workout_plannedsession(w,race)
+
+        if selectedworkout is not None:
 
-        if len(selectedworkouts) == 0:
             for w in ws:
                 remove_workout_plannedsession(w,race)
+                delete_race_result(w,race)
 
-        if selectedworkouts:
-            workouts = Workout.objects.filter(user=r,
-                                              id__in=selectedworkouts)
-
-            for w in ws:
-                if w.id not in selectedworkouts:
-                    remove_workout_plannedsession(w,race)
-                    delete_race_result(w,race)
+            workouts = Workout.objects.filter(id=selectedworkout)
 
             result,comments,errors = add_workout_race(workouts,race,r)