diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index ff8250d..fe3c57e 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -422,6 +422,10 @@ class ConferencesController < ApplicationController
 			return
 		end
 
+		if data[:next_step].blank?
+			session.delete(:registration)
+		end
+
 		data = register_submit
 		@register_step = is_post ? data[:next_step] : 'register'
 		@error_message = data[:error] ? data[:message] : nil
diff --git a/app/views/conferences/_register_new_organization.html.haml b/app/views/conferences/_register_new_organization.html.haml
index 418c283..966cf2e 100644
--- a/app/views/conferences/_register_new_organization.html.haml
+++ b/app/views/conferences/_register_new_organization.html.haml
@@ -1,8 +1,4 @@
 - org_index = session[:registration][:new_org_index] || 0
-- if session[:registration][:new_organization].nil?
-	- session[:registration][:new_organization] = Array.new
-	- session[:registration][:new_organization][0] = Hash.new
-	- org_index = 0
 = hidden_field_tag :new_org_index, org_index
 - if session[:registration][:new_organization].length > 1
 	%h3=_'registration.new_organization.list.title','Your New Organizations'