diff --git a/sgx_endstream.rb b/sgx_endstream.rb
index 63026d1772a6e622b617663c48f39671875fbe5b..39f4531b72d672ce1e306742df8deec38f83c321 100755
--- a/sgx_endstream.rb
+++ b/sgx_endstream.rb
@@ -128,7 +128,7 @@ ibr type: :set do |iq|
 		next
 	end
 
-	if iq.username.to_s.empty? || iq.password.to_s.empty?
+	if (iq.username.to_s.empty? || iq.password.to_s.empty?) && !iq.remove?
 		self << iq.as_error(
 			"bad-request",
 			:modify,