diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index f7003fe9..cb0eee89 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -95,19 +95,35 @@
           <div>
             {% if workout.name != '' %}
             <h3>
+              {% if team %}
+              <a
+              href={% url rower.defaultlandingpage3 id=workout.id|encode %}
+              title="{{ rower.defaultlandingpage3|verbose }}">
+              {{ workout.name }} ({{ workout.user.user.first_name }} {{ workout.user.user.last_name}})
+              </a>
+              {% else %}
               <a
               href={% url rower.defaultlandingpage3 id=workout.id|encode %}
               title="{{ rower.defaultlandingpage3|verbose }}">
               {{ workout.name }}
               </a>
+              {% endif %}
             </h3>
             {% else %}
             <h3>
+              {% if team %}
               <a
               href={% url rower.defaultlandingpage id=workout.id|encode %}
               title="{{ rower.defaultlandingpage|verbose }}">
-              No Name
+              No Name  ({{ workout.user.user.first_name }} {{ workout.user.user.last_name}})
               </a>
+              {% else %}
+              <a
+              href={% url rower.defaultlandingpage id=workout.id|encode %}
+              title="{{ rower.defaultlandingpage|verbose }}">
+              No Name 
+              </a>
+              {% endif %}
             </h3>
             {% endif %}
           </div>