diff --git a/scp_udg_client_app/commands/is_alive.py b/scp_udg_client_app/commands/is_alive.py
index 74eb8aff6fc2b9bbc964bb647c4f1a9c22a31b88..1c285bf9cf10ddcf3eb23d7b1cf19c6d0ac98823 100755
--- a/scp_udg_client_app/commands/is_alive.py
+++ b/scp_udg_client_app/commands/is_alive.py
@@ -15,8 +15,8 @@ logger = click_log.basic_config(__name__)
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @click.option('--token', show_envvar=True,
               help="The token passed directly from the command line has higher precedence than the one in the --token-file")
diff --git a/scp_udg_client_app/commands/last_request.py b/scp_udg_client_app/commands/last_request.py
index 0c6c6026a8efb07a025825d61ad9a8d7d7891556..b62591e3d17ed14926fb0da64e97ced8bb3b45f7 100755
--- a/scp_udg_client_app/commands/last_request.py
+++ b/scp_udg_client_app/commands/last_request.py
@@ -18,8 +18,8 @@ RESPONSE_CODE_SUCCESS = '03'
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @click.option('--token-file', type=click.Path(readable=True, writable=True, dir_okay=False),
               required=True, default='token.json', show_envvar=True,
diff --git a/scp_udg_client_app/commands/login.py b/scp_udg_client_app/commands/login.py
index 8d3e302fd2c4f34e7a7b15b2eb50153771bc8d38..f1447a2cda41e4976308fc8108d9ef883ff11a99 100755
--- a/scp_udg_client_app/commands/login.py
+++ b/scp_udg_client_app/commands/login.py
@@ -14,8 +14,8 @@ logger = click_log.basic_config(__name__)
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @click.option('--token-file', type=click.Path(readable=True, writable=True, dir_okay=False),
               required=True, default='token.json', show_envvar=True,
diff --git a/scp_udg_client_app/commands/push.py b/scp_udg_client_app/commands/push.py
index 16fed6402807fc2a98e4f4c41681b21d02f47e2f..ee75549ae40e3b1234de280f522795a66155382f 100755
--- a/scp_udg_client_app/commands/push.py
+++ b/scp_udg_client_app/commands/push.py
@@ -306,8 +306,8 @@ def job(poller):
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @login_options
 @click.option('--token-file', type=click.Path(readable=True, writable=True, dir_okay=False),
diff --git a/scp_udg_client_app/commands/report.py b/scp_udg_client_app/commands/report.py
index 5fb1a56d8126e69cb17ca90826b6cfdca11f0c55..b3486f52ec54c70a458b3821d2707ea629cde2f7 100755
--- a/scp_udg_client_app/commands/report.py
+++ b/scp_udg_client_app/commands/report.py
@@ -129,8 +129,8 @@ def job(output_file, client_name, email_frequency, scp_name, gui_url, udg_endpoi
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @click.option('--client-name')
 @click.option('--scp-name')
diff --git a/scp_udg_client_app/commands/searching_request.py b/scp_udg_client_app/commands/searching_request.py
index 0df97d10215432fd8d842e6d1cf8195d1f0dcb6d..21179b5e2520868484c997a0e0c96cbd8933c218 100755
--- a/scp_udg_client_app/commands/searching_request.py
+++ b/scp_udg_client_app/commands/searching_request.py
@@ -21,8 +21,8 @@ RESPONSE_CODE_SUCCESS = "03"
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @login_options
 @click.option('--token-file', type=click.Path(readable=True, writable=True, dir_okay=False),
diff --git a/scp_udg_client_app/commands/test.py b/scp_udg_client_app/commands/test.py
index 858c89f2b57fc98ee7d5dfcfdcadd6ba656ec865..ce29e2cabc0391b4738ff18c49855930a61c08ba 100755
--- a/scp_udg_client_app/commands/test.py
+++ b/scp_udg_client_app/commands/test.py
@@ -13,8 +13,8 @@ logger = click_log.basic_config(__name__)
 
 
 @click.command(context_settings={'show_default': True})
-@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties",
-                      help="Read configuration from a Java .properties FILE.")
+@configuration_option(implicit=False, provider=javaproperties_provider, default="config.properties", show_default=False,
+                      help="Read configuration from a Java .properties FILE.  [default: config.properties]")
 @udg_endpoint_option
 @click.pass_context
 def test(ctx, udg_endpoint):