diff --git a/fuelclient/cli/actions/user.py b/fuelclient/cli/actions/user.py
index 670ac68..adf9c6d 100644
--- a/fuelclient/cli/actions/user.py
+++ b/fuelclient/cli/actions/user.py
@@ -28,10 +28,11 @@ class UserAction(Action):
     def __init__(self):
         super(UserAction, self).__init__()
         self.args = (
-            Args.get_new_password_arg(),
+            Args.get_new_password_arg(
+                "WARNING: This method of changing the "
+                "password is dangerous - it may be saved in bash history."),
             Args.get_change_password_arg(
-                "Change user password. WARNING: This method of changing the "
-                "password is dangerous - it may be saved in bash history.")
+                "Change user password using interactive prompt")
         )
 
         self.flag_func_map = (
diff --git a/fuelclient/cli/arguments.py b/fuelclient/cli/arguments.py
index adb4f68..2cc0ffb 100644
--- a/fuelclient/cli/arguments.py
+++ b/fuelclient/cli/arguments.py
@@ -177,11 +177,11 @@ def get_env_arg(required=False):
     )
 
 
-def get_new_password_arg():
+def get_new_password_arg(help_msg):
     return get_str_arg(
         "newpass",
         flags=("--new-pass",),
-        help="new_password",
+        help=help_msg,
         required=False
     )