diff --git a/sgx_jmp.rb b/sgx_jmp.rb
index 7e978f3a36f597e319be8f46bfdf950e0bbe7639..eff7f6d4ea5d2e395c2e0946e4f5198c5483b428 100644
--- a/sgx_jmp.rb
+++ b/sgx_jmp.rb
@@ -1011,7 +1011,9 @@ end
 Command.new(
 	"https://ns.cheogram.com/sgx/jid-switch",
 	"Change JID",
-	list_for: ->(customer: nil, **) { customer },
+	list_for: lambda { |customer: nil, from_jid: nil, **|
+		customer || from_jid.to_s =~ /onboarding.cheogram.com/
+	},
 	customer_repo: CustomerRepo.new(sgx_repo: Bwmsgsv2Repo.new)
 ) {
 	Command.customer.then { |customer|