diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5e4df8f75..66a57691f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,6 +3,9 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 
+  # For the PaperTrail gem
+  before_action :set_paper_trail_whodunnit
+
   # Limit time before must log in again.
   before_action :validate_session_timestamp
   after_action :persist_session_timestamp
diff --git a/config/initializers/paper_trail.rb b/config/initializers/paper_trail.rb
new file mode 100644
index 000000000..39a667917
--- /dev/null
+++ b/config/initializers/paper_trail.rb
@@ -0,0 +1 @@
+PaperTrail.config.track_associations = false