diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 16090a885..38f9fc7b9 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -280,7 +280,7 @@ class EppController < ApplicationController
 
     # filter pw
     if request_command == 'login' && frame.present?
-      frame.gsub!(/<pw>.+<\/pw>/, '<pw>[FILTERED]</pw>')
+      frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</')
     end
 
     ApiLog::EppLog.create({
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 4a994e1e7..21e09cd43 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -2,3 +2,7 @@
 
 # Configure sensitive parameters which will be filtered from the log file.
 Rails.application.config.filter_parameters += [:password]
+
+Rails.application.config.filter_parameters << lambda do |key, value|
+  frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</') if key =~ /frame|raw_frame/i
+end