1 files changed, 9 insertions, 0 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java
index 5e22522c8..903b72eb2 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserAddCLI.java
@@ -18,6 +18,8 @@
 
 package com.netscape.cmstools.user;
 
+import java.util.Arrays;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
@@ -43,6 +45,13 @@ public class UserAddCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
+        // Check for "--help" prior to parsing due to required option
+        if (Arrays.asList(args).contains("--help")) {
+            // Display usage
+            printHelp();
+            System.exit(0);
+        }
+
         Option option = new Option(null, "fullName", true, "Full name");
         option.setArgName("fullName");
         option.setRequired(true);