diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py
index af922777f3e..3e71d92edba 100644
--- a/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py
+++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py
@@ -51,7 +51,14 @@
 ERROR_GETTING_CLIENTS = _("Error getting clients")
 ATTRIBUTE_SCHEMA_PATH = '#/components/schemas/ClientAttributes'
 URL_SUFFIX_FORMATTER = 'inum:{}'
-INTROSPECTION_ALG_PROPERTIES = ('introspectionSignedResponseAlg', 'introspectionEncryptedResponseAlg', 'introspectionEncryptedResponseEnc')
+ATTRIBUTE_ALG_PROPERTIES = (
+    'introspectionSignedResponseAlg',
+    'introspectionEncryptedResponseAlg',
+    'introspectionEncryptedResponseEnc',
+    'txTokenSignedResponseAlg',
+    'txTokenEncryptedResponseAlg',
+    'txTokenEncryptedResponseEnc',
+    )
 APP = get_app()
 
 
@@ -162,7 +169,7 @@ def save(self) -> None:
         self.data['displayName'] = self.data['clientName']
         self.data['attributes']['jansAuthorizedAcr'] = self.data.pop('jansAuthorizedAcr')
 
-        for intro_attr in INTROSPECTION_ALG_PROPERTIES:
+        for intro_attr in ATTRIBUTE_ALG_PROPERTIES:
             if intro_attr in self.data:
                 self.data['attributes'][intro_attr] = self.data.pop(intro_attr)
 
@@ -751,10 +758,6 @@ def change_view_hide(me):
 
         self.drop_down_select_first = []
 
-        # keep this line until this issue is closed https://github.com/JanssenProject/jans/issues/2372
-        self.myparent.cli_object.openid_configuration['access_token_singing_alg_values_supported'] = [
-            'HS256', 'HS384', 'HS512', 'RS256', 'RS384', 'RS512', 'ES256', 'ES384', 'ES512', 'PS256', 'PS384', 'PS512']
-
         for title, swagger_key, openid_key in (
 
                 (_("ID Token Alg for Signing "), 'idTokenSignedResponseAlg',
@@ -764,7 +767,7 @@ def change_view_hide(me):
                 (_("ID Token Enc for Encryption"), 'idTokenEncryptedResponseEnc',
                  'id_token_encryption_enc_values_supported'),
                 (_("Access Token Alg for Signing "), 'accessTokenSigningAlg',
-                 'access_token_singing_alg_values_supported'),  # ?? openid key
+                 'access_token_signing_alg_values_supported'),
 
                 (_("User Info for Signing "), 'userInfoSignedResponseAlg',
                  'userinfo_signing_alg_values_supported'),
@@ -787,6 +790,14 @@ def change_view_hide(me):
                 (_("Introspection Encrypted Response Enc"), 'introspectionEncryptedResponseEnc',
                  'id_token_encryption_enc_values_supported'),
 
+                 (_("Transaction Token Alg for Signing"), 'txTokenSignedResponseAlg',
+                 'tx_token_signing_alg_values_supported'),
+                (_("Transaction Token Alg for Encryption"), 'txTokenEncryptedResponseAlg',
+                 'tx_token_encryption_alg_values_supported'),
+                (_("Transaction Token Enc for Encryption"), 'txTokenEncryptedResponseEnc',
+                 'tx_token_encryption_enc_values_supported'),
+
+
         ):
 
             self.drop_down_select_first.append(swagger_key)
@@ -794,7 +805,7 @@ def change_view_hide(me):
             values = [(alg, alg) for alg in self.myparent.cli_object.openid_configuration.get(
                 openid_key, [])]
 
-            value = self.data.get('attributes', {}).get(swagger_key) if swagger_key in INTROSPECTION_ALG_PROPERTIES else self.data.get(swagger_key)
+            value = self.data.get('attributes', {}).get(swagger_key) if swagger_key in ATTRIBUTE_ALG_PROPERTIES else self.data.get(swagger_key)
 
             encryption_signing.append(self.myparent.getTitledWidget(
                 title,