diff --git a/thalerj/openbmctool.py b/thalerj/openbmctool.py
index 799375f..138c34c 100755
--- a/thalerj/openbmctool.py
+++ b/thalerj/openbmctool.py
@@ -2723,8 +2723,8 @@
         Called by certificate management function. Generate CSR for server/
         client certificates
         Example:
-        certificate generatecsr server NJ w3.ibm.com US IBM IBM-UNIT NY EC 2048 prime256v1 cp abc.com an.com,bm.com gn sn un in ClientAuthentication,CodeSigning
-        certificate generatecsr client NJ w3.ibm.com US IBM IBM-UNIT NY EC 2048 prime256v1 cp abc.com an.com,bm.com gn sn un in ClientAuthentication,CodeSigning
+        certificate generatecsr server NJ w3.ibm.com US IBM IBM-UNIT NY EC 2048 prime256v1 cp abc.com an.com,bm.com gn sn un in
+        certificate generatecsr client NJ w3.ibm.com US IBM IBM-UNIT NY EC 2048 prime256v1 cp abc.com an.com,bm.com gn sn un in
         @param host: string, the hostname or IP address of the bmc
         @param args: contains additional arguments used by the certificate replace sub command
         @param session: the active session to use
@@ -2737,15 +2737,16 @@
     url = "";
     if(args.type.lower() == 'server'):
         url = "/redfish/v1/Managers/bmc/NetworkProtocol/HTTPS/Certificates/"
+        usage_list = ["ServerAuthentication"]
     elif(args.type.lower() == 'client'):
         url = "/redfish/v1/AccountService/LDAP/Certificates/"
+        usage_list = ["ClientAuthentication"]
     elif(args.type.lower() == 'authority'):
         url = "/redfish/v1/Managers/bmc/Truststore/Certificates/"
     print("Generating CSR url=" + url)
     generateCSRUrl = "https://" + host + \
         "/redfish/v1/CertificateService/Actions/CertificateService.GenerateCSR"
     try:
-        usage_list = args.keyUsage.split(",")
         alt_name_list = args.alternativeNames.split(",")
         data ={"CertificateCollection":{"@odata.id":url},
             "CommonName":args.commonName, "City":args.city,
@@ -4156,8 +4157,6 @@
         help="he unstructured name of the subject")
     certGenerateCSR.add_argument('initials',
         help="The initials of the user making the request")
-    certGenerateCSR.add_argument('keyUsage', help="The usage of the key contained in the certificate")
-
     certGenerateCSR.set_defaults(func=certificateGenerateCSR)
 
     # local users