diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index abad781..3339a72 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -127,7 +127,7 @@ class ConferencesController < ApplicationController
 		case session[:registration_step] || params['step']
 			when 'confirm'
 				if session[:registration][:is_participant]
-					registration = ConferenceRegistration.find(session[:registration][:registration_id])
+					@registration = ConferenceRegistration.find(session[:registration][:registration_id])
 					if registration.completed
 						complete_registration
 						next_step = 'thanks'
@@ -305,7 +305,7 @@ class ConferencesController < ApplicationController
 				session[:registration][:questions] = params[:questions].deep_symbolize_keys
 				session[:registration][:is_workshop_host] = !params[:is_workshop_host].to_i.zero?
 				next_step = 'organizations'
-				if params[:submit] || params[:next]
+				if params[:cancel].blank?#params[:submit] || params[:next]
 					if !session[:registration][:organizations]
 						user = User.find_by(:email => session[:registration][:email])
 						session[:registration][:organizations] = Array.new
diff --git a/app/views/conferences/_register_organizations.html.haml b/app/views/conferences/_register_organizations.html.haml
index c51fbe2..9536f4c 100644
--- a/app/views/conferences/_register_organizations.html.haml
+++ b/app/views/conferences/_register_organizations.html.haml
@@ -1,5 +1,5 @@
-- registration = ConferenceRegistration.find(session[:registration][:registration_id])
-- if registration && registration.is_confirmed
+-# registration = ConferenceRegistration.find(session[:registration][:registration_id])
+- if @registration && @registration.is_confirmed
 	%h3=_'register.organizations.confirm_thanks.title','Thanks for confirming!'
 	- if session[:registration][:is_workshop_host]
 		%p=_'register.organizations.confirm_thanks.is_workshop_host.help','Before you finish, we would just like to find out where you\'re coming from and get some info about your workshop.'