diff --git a/app/assets/javascripts/admin/application.coffee b/app/assets/javascripts/admin/application.coffee
index bdc1a74bb..1b3335d63 100644
--- a/app/assets/javascripts/admin/application.coffee
+++ b/app/assets/javascripts/admin/application.coffee
@@ -2,6 +2,9 @@ $(document).on 'page:change', ->
   $('.selectize').selectize({
     allowEmptyOption: true
   })
+  $('.selectize_create').selectize({
+    allowEmptyOption: true, create: true
+  })
 
   $('.js-datepicker').datepicker({
     showAnim: "",
diff --git a/app/controllers/epp/keyrelays_controller.rb b/app/controllers/epp/keyrelays_controller.rb
index d6515758f..81ff3dd32 100644
--- a/app/controllers/epp/keyrelays_controller.rb
+++ b/app/controllers/epp/keyrelays_controller.rb
@@ -56,4 +56,8 @@ class Epp::KeyrelaysController < EppController
 
     # domain
   end
+
+  def resource
+    @domain
+  end
 end
diff --git a/app/controllers/epp/polls_controller.rb b/app/controllers/epp/polls_controller.rb
index 531509a6c..fb032975f 100644
--- a/app/controllers/epp/polls_controller.rb
+++ b/app/controllers/epp/polls_controller.rb
@@ -54,4 +54,8 @@ class Epp::PollsController < EppController
   def validate_poll
     requires_attribute 'poll', 'op', values: %(ack req), allow_blank: true
   end
+
+  def resource
+    @message
+  end
 end
diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb
index c217d38aa..58a314410 100644
--- a/app/controllers/epp/sessions_controller.rb
+++ b/app/controllers/epp/sessions_controller.rb
@@ -137,4 +137,9 @@ class Epp::SessionsController < EppController
     pw = params[:parsed_frame].css('pw').first.text
     { username: user, password: pw }
   end
+
+  private
+  def resource
+    @api_user
+  end
 end
diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index de1002604..e7d3f0ac1 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -6,8 +6,15 @@ class EppController < ApplicationController
 
   before_action :generate_svtrid
   before_action :latin_only
-
   before_action :validate_against_schema
+  before_action :validate_request
+  before_action :update_epp_session
+
+  around_action :catch_epp_errors
+
+  helper_method :current_user
+  helper_method :resource
+
   def validate_against_schema
     return if ['hello', 'error', 'keyrelay'].include?(params[:action])
     schema.validate(params[:nokogiri_frame]).each do |error|
@@ -20,10 +27,7 @@ class EppController < ApplicationController
     handle_errors and return if epp_errors.any?
   end
 
-  before_action :validate_request
-  before_action :update_epp_session
 
-  around_action :catch_epp_errors
   def catch_epp_errors
     err = catch(:epp_error) do
       yield
@@ -34,7 +38,6 @@ class EppController < ApplicationController
     handle_errors
   end
 
-  helper_method :current_user
 
   rescue_from StandardError do |e|
     @errors ||= []
@@ -367,7 +370,7 @@ class EppController < ApplicationController
       request: trimmed_request,
       request_command: request_command,
       request_successful: epp_errors.empty?,
-      request_object: params[:epp_object_type],
+      request_object: resource ? "#{params[:epp_object_type]}: #{resource.class} - #{resource.id} - #{resource.name}" : params[:epp_object_type],
       response: @response,
       api_user_name: @api_user.try(:username) || current_user.try(:username) || 'api-public',
       api_user_registrar: @api_user.try(:registrar).try(:to_s) || current_user.try(:registrar).try(:to_s),
@@ -383,4 +386,9 @@ class EppController < ApplicationController
     return if current_user.blank?
     counter_update(current_user.registrar_code, ENV['iptables_server_ip'])
   end
+
+  def resource
+    name = self.class.to_s.sub("Epp::","").sub("Controller","").underscore.singularize
+    instance_variable_get("@#{name}")
+  end
 end
diff --git a/app/models/api_user.rb b/app/models/api_user.rb
index 260441620..5d6e3afb7 100644
--- a/app/models/api_user.rb
+++ b/app/models/api_user.rb
@@ -62,6 +62,10 @@ class ApiUser < User
     username
   end
 
+  def name
+    username
+  end
+
   def queued_messages
     registrar.messages.queued
   end
diff --git a/app/models/message.rb b/app/models/message.rb
index 174edc8ef..10d823e63 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -12,4 +12,8 @@ class Message < ActiveRecord::Base
     self.queued = false
     save
   end
+
+  def name
+    "-"
+  end
 end
diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml
index 550a20014..3bb8536d3 100644
--- a/app/views/admin/epp_logs/index.haml
+++ b/app/views/admin/epp_logs/index.haml
@@ -11,8 +11,10 @@
             = f.select :request_command_eq, [[t(:choose),''], 'hello', 'login', 'logout', 'info', 'create', 'update', 'delete', 'check', 'renew', 'transfer', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t(:choose)
         .col-md-3
           .form-group
+            - opts  = [[t(:choose),''], 'contact', 'domain', 'poll', 'keyrelay']
+            - opts += [params[:q][:request_object_cont]] if params[:q].present? && params[:q][:request_object_cont].present?
             = f.label :request_object
-            = f.select :request_object_eq, [[t(:choose),''], 'contact', 'domain', 'poll', 'keyrelay'], {}, class: 'form-control selectize', placeholder: t(:choose)
+            = f.select :request_object_cont, opts, {}, class: 'form-control selectize_create', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label :request_successful
diff --git a/config/routes.rb b/config/routes.rb
index a041e41b7..39d6b3937 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,7 @@ Rails.application.routes.draw do
 
     post 'command/:action', controller: 'domains', constraints: EppConstraint.new(:domain)
     post 'command/:action', controller: 'contacts', constraints: EppConstraint.new(:contact)
-    post 'command/poll', to: 'polls#poll', constraints: EppConstraint.new(:poll)
+    post 'command/poll',     to: 'polls#poll', constraints: EppConstraint.new(:poll)
     post 'command/keyrelay', to: 'keyrelays#keyrelay', constraints: EppConstraint.new(:keyrelay)
 
     post 'command/:command', to: 'errors#not_found', constraints: EppConstraint.new(:not_found) # fallback route