diff --git a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/CertifyUserIdCmd.kt b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/CertifyUserIdCmd.kt
index 71ef79f..228809b 100644
--- a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/CertifyUserIdCmd.kt
+++ b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/CertifyUserIdCmd.kt
@@ -6,10 +6,8 @@ package sop.cli.picocli.commands
 
 import java.io.IOException
 import picocli.CommandLine.Command
-import picocli.CommandLine.Model.CommandSpec
 import picocli.CommandLine.Option
 import picocli.CommandLine.Parameters
-import picocli.CommandLine.Spec
 import sop.cli.picocli.SopCLI
 import sop.exception.SOPGPException.BadData
 import sop.exception.SOPGPException.UnsupportedOption
@@ -17,11 +15,10 @@ import sop.exception.SOPGPException.UnsupportedOption
 @Command(
     name = "certify-userid",
     resourceBundle = "msg_certify-userid",
-    exitCodeOnInvalidInput = UnsupportedOption.EXIT_CODE)
+    exitCodeOnInvalidInput = UnsupportedOption.EXIT_CODE,
+    showEndOfOptionsDelimiterInUsageHelp = true)
 class CertifyUserIdCmd : AbstractSopCmd() {
 
-    @Spec var spec: CommandSpec? = null
-
     @Option(names = ["--no-armor"], negatable = true) var armor = true
 
     @Option(names = ["--userid"], required = true, arity = "1..*", paramLabel = "USERID")
diff --git a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/ValidateUserIdCmd.kt b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/ValidateUserIdCmd.kt
index c2de148..da81a27 100644
--- a/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/ValidateUserIdCmd.kt
+++ b/sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/ValidateUserIdCmd.kt
@@ -15,7 +15,8 @@ import sop.util.HexUtil.Companion.bytesToHex
 @Command(
     name = "validate-userid",
     resourceBundle = "msg_validate-userid",
-    exitCodeOnInvalidInput = SOPGPException.MissingArg.EXIT_CODE)
+    exitCodeOnInvalidInput = SOPGPException.MissingArg.EXIT_CODE,
+    showEndOfOptionsDelimiterInUsageHelp = true)
 class ValidateUserIdCmd : AbstractSopCmd() {
 
     @Option(names = ["--addr-spec-only"]) var addrSpecOnly: Boolean = false