diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index e0aa59e6388a5a416b9d5a644ef1a908734508c8..e857065372afc93421ca2d9029358e07d57c2cde 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -18,7 +18,7 @@ class SessionsController < ApplicationController
   end
 
   def show
-    @conference = Conference.find_by(slug: params[:slug])
+    @conference = Conference.find_by(slug: params[:conference_slug])
     @session = Session.includes(:stage).find_by(conference: @conference, ref_id: params[:ref_id])
     @users = User.all
   end
diff --git a/app/views/assignments/by_user.html.erb b/app/views/assignments/by_user.html.erb
index 0a5bdafbc7cdc9de08ebea406de5ed798092919b..1b5f1c5cf67dd29f5a48a9806db8b2ea4edc582f 100644
--- a/app/views/assignments/by_user.html.erb
+++ b/app/views/assignments/by_user.html.erb
@@ -13,7 +13,7 @@
         <% assignments_on_date.each do |assignment| %>
           <li class="<%= assignment.session.starts_at < now ? "past" : "future" %>">
             <span class="tabular-nums"><%= assignment.session.starts_at.strftime('%H:%M') %> &ndash; <%= assignment.session.ends_at.strftime('%H:%M') %></span>:
-            <%= link_to assignment.session.title, assignment.session %> @ <%= assignment.session.stage.name %>
+            <%= link_to assignment.session.title, conference_session_path(assignment.session.conference, assignment.session) %> @ <%= assignment.session.stage.name %>
             <small><% assignment.session.assignments.map(&:user).each do |other_user| %>
               <%= render partial: 'application/user_avatar', locals: { user: other_user } %>
             <% end %></small>