diff --git a/app/views/assignments/by_user.html.erb b/app/views/assignments/by_user.html.erb
index 555708396cc9956863dd5b323c3e569ab854c3cc..18e263eb8c69f7f99916fca69b351e7777b1db62 100644
--- a/app/views/assignments/by_user.html.erb
+++ b/app/views/assignments/by_user.html.erb
@@ -12,14 +12,14 @@
       </tr>
     </thead>
     <tbody>
-  <% @user.assignments.future.includes(:session, session: :conference).order('sessions.starts_at').each do |assignment| %>
-    <tr class="*:border *:p-1">
+  <% @user.assignments.includes(:session, session: :conference).order('sessions.starts_at').each do |assignment| %>
+    <tr class="*:border *:p-1 <%= assignment.session.starts_at < Time.now ? "past" : "future" %>">
       <td><%= assignment.session.conference.name %></td>
       <td><%= assignment.session.starts_at.strftime('%Y-%m-%d') %></td>
       <td><%= assignment.session.starts_at.strftime('%H:%M') %></td>
       <td><%= assignment.session.stage.name %></td>
       <td><%= link_to assignment.session.title, assignment.session.url, target: "_top" %></td>
-      <td><% assignment.session.assignments.map(&:user).reject{ |u| u == @user }.each do |other_user| %><%= render partial: 'application/user_avatar', locals: { user: other_user } %><% end %></td>
+      <td><% assignment.session.assignments.map(&:user).each do |other_user| %><%= render partial: 'application/user_avatar', locals: { user: other_user } %><% end %></td>
     </tr>
   <% end %>
   </table>
diff --git a/app/views/assignments/index.html.erb b/app/views/assignments/index.html.erb
index 456a7b33c2821524ad93ff9c75ed8f01a2cd8ee0..763d0018587ead459e88ac03b65140147d7f7b27 100644
--- a/app/views/assignments/index.html.erb
+++ b/app/views/assignments/index.html.erb
@@ -10,7 +10,7 @@
               <li class="<%= assignment.session.starts_at < now ? "past" : "future" %>">
                 <%= assignment.session.starts_at.strftime('%H:%M') %> @ <%= assignment.session.stage.name %>:
                 <%= link_to assignment.session.title, assignment.session %>
-                <small><% assignment.session.assignments.map(&:user).reject{ |u| u == user }.each do |other_user| %>
+                <small><% assignment.session.assignments.map(&:user).each do |other_user| %>
                   <%= render partial: 'application/user_avatar', locals: { user: other_user } %>
                 <% end %></small>
               </li>