diff --git a/app/controllers/concerns/current_request.rb b/app/controllers/concerns/current_request.rb
index b7e4af73d..15f574ab0 100644
--- a/app/controllers/concerns/current_request.rb
+++ b/app/controllers/concerns/current_request.rb
@@ -4,10 +4,10 @@ module CurrentRequest
   included do
     before_action do
       Current.http_method = request.method
-      Current.request_id = request.uuid
-      Current.user_agent = request.user_agent
-      Current.ip_address = request.ip
-      Current.referrer = request.referrer
+      Current.request_id  = request.uuid
+      Current.user_agent  = request.user_agent
+      Current.ip_address  = request.ip
+      Current.referrer    = request.referrer
     end
   end
 end
diff --git a/app/models/current.rb b/app/models/current.rb
index 074d22055..9974e5db9 100644
--- a/app/models/current.rb
+++ b/app/models/current.rb
@@ -1,6 +1,6 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :session
-  attribute :http_method, :request_id, :user_agent, :ip_address, :referrer, :identity_token
+  attribute :session, :identity_token
+  attribute :http_method, :request_id, :user_agent, :ip_address, :referrer
 
   delegate :user, to: :session, allow_nil: true
 end