4 files changed, 4 insertions, 14 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4a89410d3..8b66e6097 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,4 @@
 class ApplicationController < ActionController::Base
-  include PaperTrailSupport
   include MetadataControllerSupport
   include Pundit
   include FeatureChecker
diff --git a/app/controllers/chouette_controller.rb b/app/controllers/chouette_controller.rb
index 3e4f3af27..e6e7c0a8a 100644
--- a/app/controllers/chouette_controller.rb
+++ b/app/controllers/chouette_controller.rb
@@ -1,4 +1,3 @@
 class ChouetteController < InheritedResources::Base
-  include PaperTrailSupport
   include ApplicationHelper
 end
diff --git a/app/controllers/concerns/metadata_controller_support.rb b/app/controllers/concerns/metadata_controller_support.rb
index 4ac625c01..41ac537bf 100644
--- a/app/controllers/concerns/metadata_controller_support.rb
+++ b/app/controllers/concerns/metadata_controller_support.rb
@@ -11,7 +11,10 @@ module MetadataControllerSupport
   end
 
   def set_creator_metadata
-    resource.try(:set_metadata!, :creator_username, user_for_metadata) if resource.valid?
+    if resource.valid?
+      resource.try(:set_metadata!, :creator_username, user_for_metadata)
+      resource.try(:set_metadata!, :modifier_username, user_for_metadata)
+    end
   end
 
   def set_modifier_metadata
diff --git a/app/controllers/concerns/paper_trail_support.rb b/app/controllers/concerns/paper_trail_support.rb
deleted file mode 100644
index 4b0b1a7c7..000000000
--- a/app/controllers/concerns/paper_trail_support.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module PaperTrailSupport
-  extend ActiveSupport::Concern
-
-  included do
-    before_action :set_paper_trail_whodunnit
-
-    def user_for_paper_trail
-      current_user ? current_user.name : ''
-    end
-  end
-end