diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index 0108aec0..1113fcba 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -1,6 +1,5 @@
 class InstallController < BaseController
-  # skip_before_action :set_current_tenant_by_subdomain_or_name
-  skip_before_action :verify_authenticity_token
+  before_action :lookup_domain
 
 	def index
 	end
diff --git a/app/controllers/review_license_controller.rb b/app/controllers/review_license_controller.rb
index 99fd900f..e1739aac 100644
--- a/app/controllers/review_license_controller.rb
+++ b/app/controllers/review_license_controller.rb
@@ -1,4 +1,5 @@
-class ReviewLicenseController < ApplicationController
+class ReviewLicenseController < BaseController
+  before_action :lookup_domain
 
   def index
     @license = current_license
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 254b420a..87e2ea55 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -1,5 +1,5 @@
 class ActionController::Base
-  before_action :lookup_domain
+  before_action :lookup_domain if Rails.env.production?
   before_action :set_locale
 
   helper_method :current_license,