diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 43462b13903c9a1d27a836cc2433eb6a4a9cc543..d14b1dbecf60b1f01e12719f6e48f04b91acea5b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -70,6 +70,16 @@ class ApplicationController < ActionController::Base
 
   protected
 
+  def append_info_to_payload(payload)
+    super
+    payload[:remote_ip] = request.remote_ip
+
+    if current_user.present?
+      payload[:user_id] = current_user.id
+      payload[:username] = current_user.username
+    end
+  end
+
   # This filter handles both private tokens and personal access tokens
   def authenticate_user_from_private_token!
     token = params[:private_token].presence || request.headers['PRIVATE-TOKEN'].presence
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb
index 039b4c87b0dc01e033e08d4071491e3c4f23d2ce..21fe8d72459dba388cb1f5bf2eb301a004a0896a 100644
--- a/config/initializers/lograge.rb
+++ b/config/initializers/lograge.rb
@@ -14,7 +14,10 @@ unless Sidekiq.server?
     config.lograge.custom_options = lambda do |event|
       {
         time: event.time.utc.iso8601(3),
-        params: event.payload[:params].except(*%w(controller action format))
+        params: event.payload[:params].except(*%w(controller action format)),
+        remote_ip: event.payload[:remote_ip],
+        user_id: event.payload[:user_id],
+        username: event.payload[:username]
       }
     end
   end