diff --git a/lib/controller_issues_listener.rb b/lib/controller_issues_listener.rb
deleted file mode 100644
index cdb092d..0000000
--- a/lib/controller_issues_listener.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ControllerIssuesListener.rb < Redmine::Hook::ControllerListener
-  def controller_issues_new_before_save(context={})
-    context[:issue].project = Project.find_by identifier: context[:params][:project]
-  end
-end
diff --git a/lib/issues_form_hook_listener.rb b/lib/issues_form_hook_listener.rb
index 684fc26..d1e7ed7 100644
--- a/lib/issues_form_hook_listener.rb
+++ b/lib/issues_form_hook_listener.rb
@@ -28,14 +28,10 @@ class IssuesFormHookListener < Redmine::Hook::ViewListener
     selected_vehicle = context[:issue].vehicles_id ? context[:issue].vehicles_id : nil
 
     #check project level customer ownership
-    if context[:issue].project.customer
-      selected_customer =  context[:issue].project.customer.id ? selected_customer.nil?  : nil
-    end
+    selected_customer =  context[:project].customer.id ? selected_customer.nil?  : nil
     
     #check project level vehicle ownership
-    if context[:issue].project.vehicle
-      selected_vehicle = context[:issue].project.vehicle.id ? selected_vehicle.nil? : nil
-    end
+    selected_vehicle = context[:project].vehicle.id ? selected_vehicle.nil? : nil
     
     # Load customer information
     customer = Customer.find_by_id(selected_customer) if selected_customer