diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 2d054f73d..0e98c439b 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -16,9 +16,9 @@ module Admin
         search_params.delete(:registrant)
       end
 
-      if search_params[:registrar].present?
-        registrars = Registrar.where("name ilike ?", "%#{search_params[:registrar].strip}%")
-        search_params.delete(:registrar)
+      if search_params[:whodunnit].present?
+        registrars = Registrar.where("name ilike ?", "%#{search_params[:whodunnit].strip}%")
+        search_params.delete(:whodunnit)
       end
 
       whereS = "1=1"
diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml
index 248d58538..0058d3d97 100644
--- a/app/views/admin/domain_versions/archive.haml
+++ b/app/views/admin/domain_versions/archive.haml
@@ -15,7 +15,7 @@
         .col-md-3
           .form-group
             = label_tag t(:registrar_name)
-            = f.search_field :registrar, value: params[:q][:registrar], class: 'form-control', placeholder: t('.registrant')
+            = f.select :whodunnit, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, class: 'form-control', placeholder: t('.registrant')
         .col-md-3
           .form-group
             = label_tag :action
diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml
index 33ba4f96f..aee0705ed 100644
--- a/app/views/admin/epp_logs/index.haml
+++ b/app/views/admin/epp_logs/index.haml
@@ -27,7 +27,7 @@
         .col-md-3
           .form-group
             = f.label :registrar
-            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
+            = f.select :api_user_registrar_cont, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, class: 'form-control', placeholder: t(:choose)
         .col-md-3
           .form-group
             = f.label t(:created_after)
diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml
index 14608f99f..814090fec 100644
--- a/app/views/admin/repp_logs/index.haml
+++ b/app/views/admin/repp_logs/index.haml
@@ -25,7 +25,8 @@
         .col-md-3
           .form-group
             = f.label :registrar
-            = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
+            = f.select :api_user_registrar_cont, Registrar.all.map { |x| [x, x.name] }, { include_blank: true }, class: 'form-control', placeholder: t(:choose)
+            -# = f.search_field :api_user_registrar_cont, class: 'form-control', placeholder: t(:registrar_name), autocomplete: 'off'
         .col-md-3
           .form-group
             = f.label t(:created_after)