diff --git a/app/controllers/management/management_controller.rb b/app/controllers/management/management_controller.rb
index aa98b89..cefbbaf 100644
--- a/app/controllers/management/management_controller.rb
+++ b/app/controllers/management/management_controller.rb
@@ -12,8 +12,12 @@ module Management
     helper_method :current_conference?
 
     def current_conference
-      if not @current_conference and params[:conference_id].present?
-        @current_conference = Conference.find(params[:conference_id])
+      if not @current_conference
+        if @conference
+          @current_conference = @conference
+        elsif params[:conference_id].present?
+          @current_conference = Conference.find(params[:conference_id])
+        end
       end
 
       @current_conference