diff --git a/rowers/models.py b/rowers/models.py
index b2f26e18..9278e80b 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1641,12 +1641,23 @@ class VirtualRaceResult(models.Model):
             u1 = rr.user.first_name,
             u2 = rr.user.last_name,
             )
-        return u'Entry for {n} for "{r}" in {c} {d}'.format(
-            n = name,
-            r = self.race,
-            d = self.boattype,
-            c = self.boatclass,
+        if self.teamname:
+            return u'Entry for {n} for "{r}" in {c} {d} with {t} ({s})'.format(
+                n = name,
+                r = self.race,
+                d = self.boattype,
+                c = self.boatclass,
+                t = self.teamname,
+                s = self.sex,
             )
+        else:
+            return u'Entry for {n} for "{r}" in {c} {d} ({s})'.format(
+                n = name,
+                r = self.race,
+                d = self.boattype,
+                c = self.boatclass,
+                s = self.sex,
+                )
 
 
 class CourseTestResult(models.Model):