1 files changed, 8 insertions, 0 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java
index ed88163a7..5c01db290 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java
@@ -19,6 +19,7 @@
 package com.netscape.cmstools.user;
 
 import java.net.URLEncoder;
+import java.util.Arrays;
 
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -42,6 +43,13 @@ public class UserCertRemoveCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
+        // Check for "--help"
+        if (Arrays.asList(args).contains("--help")) {
+            // Display usage
+            printHelp();
+            System.exit(0);
+        }
+
         if (args.length != 2) {
             printHelp();
             System.exit(1);