diff --git a/init.rb b/init.rb
index 9505f7e..72bb554 100644
--- a/init.rb
+++ b/init.rb
@@ -1,6 +1,6 @@
 require 'redmine'
 
-ActionDispatch::Callbacks.to_prepare do
+(Rails.version < '5.1' ? ActionDispatch::Callbacks : ActiveSupport::Reloader).to_prepare do
   require_dependency 'project'
   require_dependency 'principal'
   require_dependency 'user'
diff --git a/lib/notify_custom_users/issue_patch.rb b/lib/notify_custom_users/issue_patch.rb
index b411fe4..8faad26 100644
--- a/lib/notify_custom_users/issue_patch.rb
+++ b/lib/notify_custom_users/issue_patch.rb
@@ -3,7 +3,8 @@ module IssuePatch
     def self.included(base)
       base.send :include, InstanceMethods
       base.class_eval do
-        alias_method_chain :notified_users, :custom_users
+        alias_method :notified_users_without_custom_users, :notified_users
+        alias_method :notified_users, :notified_users_with_custom_users
       end
     end