diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index ba46032c8..440c731b2 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -110,12 +110,8 @@ class EppController < ApplicationController
   end
 
   def current_user
-    @current_user ||= epp_session.user
-    # by default PaperTrail uses before filter and at that
-    # time current_user is not yet present
-    ::PaperTrail.whodunnit = user_log_str(@current_user)
-    ::PaperSession.session = epp_session.session_id
-    @current_user
+    return unless signed_in?
+    epp_session.user
   end
 
   # ERROR + RESPONSE HANDLING