diff --git a/jans-cli-tui/docs/remote_install.md b/jans-cli-tui/docs/remote_install.md
index 7cc8b4fd034..ea45b5389cc 100644
--- a/jans-cli-tui/docs/remote_install.md
+++ b/jans-cli-tui/docs/remote_install.md
@@ -15,10 +15,11 @@ Get Credidentials for CLI
 On Jans server
 
 ```
-# cat /opt/jans/jans-setup/setup.properties.last | grep role
-role_based_client_encoded_pw=dDpwNN3lv94JF+ibgVFT7A\=\=
-role_based_client_id=2000.076aa5d9-fa8d-42a0-90d2-b83b5ea535d5
-role_based_client_pw=mrF8tcBd6m9Q
+# cat /opt/jans/jans-setup/setup.properties.last | grep tui
+tui_client_encoded_pw=4j858txd4OfXV1Kkx92YNA\=\=
+tui_client_id=2000.114cd953-3365-4208-ae5f-97237a01d334
+tui_client_pw=bhizfR4cwC1h
+
 ```
 
-`role_based_client_id` wile go **Client ID** and `role_based_client_pw` will go **Client Secret**
+`tui_client_id` will go **Client ID** and `tui_client_pw` will go **Client Secret**
diff --git a/jans-linux-setup/jans_setup/setup_app/installers/jans_cli.py b/jans-linux-setup/jans_setup/setup_app/installers/jans_cli.py
index 1b588e6320c..2ac27a2bd9e 100644
--- a/jans-linux-setup/jans_setup/setup_app/installers/jans_cli.py
+++ b/jans-linux-setup/jans_setup/setup_app/installers/jans_cli.py
@@ -87,7 +87,7 @@ def install(self):
 
 
     def generate_configuration(self):
-        self.check_clients([('role_based_client_id', '2000.')])
+        self.check_clients([('tui_client_id', '2000.')])
 
     def configure(self, options={}):
         config = configparser.ConfigParser()
@@ -107,8 +107,8 @@ def configure(self, options={}):
             config['DEFAULT'][key_] = options[key_]
 
         if Config.install_config_api:
-            config['DEFAULT']['jca_client_id'] = Config.role_based_client_id
-            config['DEFAULT']['jca_client_secret_enc'] = Config.role_based_client_encoded_pw
+            config['DEFAULT']['jca_client_id'] = Config.tui_client_id
+            config['DEFAULT']['jca_client_secret_enc'] = Config.tui_client_encoded_pw
             if base.argsp.cli_test_client:
                 config['DEFAULT']['jca_test_client_id'] = Config.jca_client_id
                 config['DEFAULT']['jca_test_client_secret_enc'] = Config.jca_client_encoded_pw
diff --git a/jans-linux-setup/jans_setup/templates/jans-cli/client.ldif b/jans-linux-setup/jans_setup/templates/jans-cli/client.ldif
index 5bf201068bb..68509101d00 100644
--- a/jans-linux-setup/jans_setup/templates/jans-cli/client.ldif
+++ b/jans-linux-setup/jans_setup/templates/jans-cli/client.ldif
@@ -1,15 +1,15 @@
 version: 1
-dn: inum=%(role_based_client_id)s,ou=clients,o=jans
+dn: inum=%(tui_client_id)s,ou=clients,o=jans
 objectClass: top
 objectClass: jansClnt
 del: false
-displayName: Jans Role Based Client
-inum: %(role_based_client_id)s
+displayName: Jans TUI Client
+inum: %(tui_client_id)s
 jansAccessTknAsJwt: true
 jansAccessTknSigAlg: RS256
 jansAppTyp: web
 jansAttrs: {"tlsClientAuthSubjectDn":"","runIntrospectionScriptBeforeJwtCreation":true,"keepClientAuthorizationAfterExpiration":false,"allowSpontaneousScopes":false,"spontaneousScopes":[],"spontaneousScopeScriptDns":[],"updateTokenScriptDns":[],"backchannelLogoutUri":[],"backchannelLogoutSessionRequired":false,"additionalAudience":[],"postAuthnScripts":[],"consentGatheringScripts":[],"introspectionScripts":["inum=A44E-4F3D,ou=scripts,o=jans"],"rptClaimsScripts":[],"parLifetime":600,"requirePar":false,"jansAuthSignedRespAlg":null,"jansAuthEncRespAlg":null,"jansAuthEncRespEnc":null}
-jansClntSecret: %(role_based_client_encoded_pw)s
+jansClntSecret: %(tui_client_encoded_pw)s
 jansDisabled: false
 jansGrantTyp: authorization_code
 jansGrantTyp: refresh_token