diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 70ed5755..c71c8599 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -169,7 +169,7 @@ class HomeController < ApplicationController
 
   def destroy
     # clear in employee session
-    Employee.logout(@shop,session[:session_token])
+    Employee.logout(current_shop,session[:session_token])
     session[:session_token] = nil
     # redirect_to root_path
     render :json => {:status=> "Success", :url => root_path }.to_json
diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb
index 5c9dae6f..140ff2c0 100755
--- a/app/controllers/settings/employees_controller.rb
+++ b/app/controllers/settings/employees_controller.rb
@@ -31,7 +31,7 @@ class Settings::EmployeesController < ApplicationController
   # POST /employees.json
   def create
     @employee = Employee.new(employee_params)
-    @employee.shop_code = @shop.shop_code
+    @employee.shop_code =current_shop.shop_code
     respond_to do |format|
       if @employee.save
         format.html { redirect_to settings_employees_path, notice: 'Employee was successfully created.' }
diff --git a/app/controllers/settings/lookups_controller.rb b/app/controllers/settings/lookups_controller.rb
index 87c81842..4390dadd 100755
--- a/app/controllers/settings/lookups_controller.rb
+++ b/app/controllers/settings/lookups_controller.rb
@@ -25,7 +25,7 @@ class Settings::LookupsController < ApplicationController
   # POST /settings/lookups.json
   def create
     @settings_lookup = Lookup.new(settings_lookup_params)
-    @settings_lookup.shop_code = @shop.shop_code
+    @settings_lookup.shop_code = current_shop.shop_code
     respond_to do |format|
       if @settings_lookup.save
         format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully created.' }