diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans.py b/jans-linux-setup/jans_setup/setup_app/installers/jans.py
index 389fb3bdf6c..bc3692ed8f0 100644
--- a/jans-linux-setup/jans_setup/setup_app/installers/jans.py
+++ b/jans-linux-setup/jans_setup/setup_app/installers/jans.py
@@ -434,11 +434,9 @@ def import_custom_ldif_dir(self, ldif_dir):
     def create_test_client(self):
         ldif_fn = self.clients_ldif_fn = os.path.join(Config.output_dir, 'test-client.ldif')
         client_id = Config.get('test_client_id') or base.argsp.test_client_id
-        client_pw = Config.get('test_client_pw') or base.argsp.test_client_secret or self.getPW()
+        client_pw = Config.get('test_client_pw') or base.argsp.test_client_pw or self.getPW()
         encoded_pw = self.obscure(client_pw)
-        trusted_client = Config.get('test_client_trusted_client')
-        if not trusted_client:
-            trusted_client = 'true' if base.argsp.test_client_trusted else 'false'
+        trusted_client = 'true' if (Config.get('test_client_trusted') or base.argsp.test_client_trusted) else 'false'
 
         if base.argsp.test_client_redirect_uri:
             redirect_uri = base.argsp.test_client_redirect_uri.split(',')
@@ -464,7 +462,7 @@ def create_test_client(self):
         Config.test_client_pw = client_pw
         Config.test_client_pw_encoded = encoded_pw
         Config.test_client_redirect_uri = redirect_uri
-        Config.test_client_trusted_client = trusted_client
+        Config.test_client_trusted = trusted_client
         Config.test_client_scopes = ' '.join(scopes)
 
 
diff --git a/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py b/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
index 7abeb4bcea1..04d93f4ff12 100644
--- a/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
+++ b/jans-linux-setup/jans_setup/setup_app/utils/arg_parser.py
@@ -106,7 +106,7 @@
 
     # test-client
     parser.add_argument('-test-client-id', help="ID of test client which has all available scopes. Must be in UUID format.")
-    parser.add_argument('-test-client-secret', help="Secret for test client")
+    parser.add_argument('-test-client-pw', help="Secret for test client")
     parser.add_argument('-test-client-redirect-uri', help="Redirect URI for test client")
     parser.add_argument('--test-client-trusted', help="Make test client trusted", action='store_true')