5 files changed, 24 insertions, 7 deletions
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 43da07aa..e0b1f1a3 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -120,7 +120,7 @@ class ListEndpoint(lister.Lister):
             '--long',
             action='store_true',
             default=False,
-            help='Additional fields are listed in output')
+            help='List additional fields in output')
         return parser
 
     def take_action(self, parsed_args):
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index b5d24ef5..6c059b5d 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -197,7 +197,7 @@ class ListGroup(lister.Lister):
             '--long',
             action='store_true',
             default=False,
-            help='Additional fields are listed in output',
+            help='List additional fields in output',
         )
         return parser
 
diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index cdbb1cf2..a760d8cd 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.py
@@ -37,7 +37,7 @@ class CreatePolicy(show.ShowOne):
             '--type',
             metavar='<policy-type>',
             default="application/json",
-            help='New MIME Type of the policy blob - i.e.: application/json',
+            help='New MIME type of the policy blob - i.e.: application/json',
         )
         parser.add_argument(
             'blob_file',
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index 68f9ffef..3cc78cd7 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -213,12 +213,12 @@ class DeleteAccessToken(command.Command):
         parser.add_argument(
             'user',
             metavar='<user>',
-            help='Name or Id of user',
+            help='Name or ID of user',
         )
         parser.add_argument(
             'access_key',
             metavar='<access-key>',
-            help='Access Token to be deleted',
+            help='Access token to be deleted',
         )
         return parser
 
@@ -243,7 +243,7 @@ class ListAccessToken(lister.Lister):
         parser.add_argument(
             'user',
             metavar='<user>',
-            help='Name or Id of user',
+            help='Name or ID of user',
         )
         return parser
 
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 54ffe561..060eeca7 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -44,6 +44,12 @@ class CreateUser(show.ShowOne):
             help='New user password',
         )
         parser.add_argument(
+            '--password-prompt',
+            dest="password_prompt",
+            action="store_true",
+            help='Prompt interactively for password',
+        )
+        parser.add_argument(
             '--email',
             metavar='<user-email>',
             help='New user email address',
@@ -97,6 +103,8 @@ class CreateUser(show.ShowOne):
         enabled = True
         if parsed_args.disable:
             enabled = False
+        if parsed_args.password_prompt:
+            parsed_args.password = utils.get_password(self.app.stdin)
 
         user = identity_client.users.create(
             parsed_args.name,
@@ -174,7 +182,7 @@ class ListUser(lister.Lister):
             '--long',
             action='store_true',
             default=False,
-            help='Additional fields are listed in output',
+            help='List additional fields in output',
         )
         return parser
 
@@ -274,6 +282,12 @@ class SetUser(command.Command):
             help='New user password',
         )
         parser.add_argument(
+            '--password-prompt',
+            dest="password_prompt",
+            action="store_true",
+            help='Prompt interactively for password',
+        )
+        parser.add_argument(
             '--email',
             metavar='<user-email>',
             help='New user email address',
@@ -310,6 +324,9 @@ class SetUser(command.Command):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
 
+        if parsed_args.password_prompt:
+            parsed_args.password = utils.get_password(self.app.stdin)
+
         if (not parsed_args.name
                 and not parsed_args.name
                 and not parsed_args.password