diff --git a/app/controllers/repp/v1/domains_controller.rb b/app/controllers/repp/v1/domains_controller.rb
index ba90f23f2..3715e78ed 100644
--- a/app/controllers/repp/v1/domains_controller.rb
+++ b/app/controllers/repp/v1/domains_controller.rb
@@ -68,9 +68,7 @@ module Repp
 
       def set_authorized_domain
         @epp_errors ||= []
-        h = {}
-        h[transfer_info_params[:id].match?(/\A[0-9]+\z/) ? :id : :name] = transfer_info_params[:id]
-        @domain = Domain.find_by!(h)
+        @domain = domain_from_url_hash
 
         return if @domain.transfer_code.eql?(request.headers['Auth-Code'])
 
@@ -78,6 +76,13 @@ module Repp
         handle_errors
       end
 
+      def domain_from_url_hash
+        entry = transfer_info_params[:id]
+        return Domain.find(entry) if entry.match?(/\A[0-9]+\z/)
+
+        Domain.find_by!('name = ? OR name_puny = ?', entry, entry)
+      end
+
       def limit
         index_params[:limit] || 200
       end