diff --git a/jans-config-api/docs/jans-config-api-swagger-auto.yaml b/jans-config-api/docs/jans-config-api-swagger-auto.yaml
index 0a58de0f9aa..34e9ee79686 100644
--- a/jans-config-api/docs/jans-config-api-swagger-auto.yaml
+++ b/jans-config-api/docs/jans-config-api-swagger-auto.yaml
@@ -2945,19 +2945,19 @@ components:
           $ref: '#/components/schemas/AttributeValidation'
         tooltip:
           type: string
-        whitePagesCanView:
+        adminCanAccess:
           type: boolean
-        userCanAccess:
+        adminCanView:
           type: boolean
-        userCanView:
+        adminCanEdit:
           type: boolean
-        adminCanAccess:
+        userCanAccess:
           type: boolean
-        adminCanView:
+        userCanView:
           type: boolean
         userCanEdit:
           type: boolean
-        adminCanEdit:
+        whitePagesCanView:
           type: boolean
         baseDn:
           type: string
@@ -3386,10 +3386,10 @@ components:
           type: array
           items:
             type: string
-        displayValue:
-          type: string
         value:
           type: string
+        displayValue:
+          type: string
     LocalizedString:
       type: object
       properties:
@@ -3397,13 +3397,13 @@ components:
           type: object
           additionalProperties:
             type: string
+        value:
+          type: string
         languageTags:
           uniqueItems: true
           type: array
           items:
             type: string
-        value:
-          type: string
     AppConfiguration:
       type: object
       properties:
@@ -4088,6 +4088,8 @@ components:
           type: string
         agamaConfiguration:
           $ref: '#/components/schemas/EngineConfig'
+        ssaConfiguration:
+          $ref: '#/components/schemas/SsaConfiguration'
         enabledFeatureFlags:
           uniqueItems: true
           type: array
@@ -4114,6 +4116,9 @@ components:
             - METRIC
             - STAT
             - PAR
+            - SSA
+        fapi:
+          type: boolean
         allResponseTypesSupported:
           uniqueItems: true
           type: array
@@ -4123,8 +4128,6 @@ components:
             - code
             - token
             - id_token
-        fapi:
-          type: boolean
     AuthenticationFilter:
       required:
       - baseDn
@@ -4264,6 +4267,20 @@ components:
           type: object
           additionalProperties:
             type: string
+    SsaConfiguration:
+      type: object
+      properties:
+        ssaEndpoint:
+          type: string
+        ssaCustomAttributes:
+          type: array
+          items:
+            type: string
+        ssaSigningAlg:
+          type: string
+        ssaExpirationInDays:
+          type: integer
+          format: int32
     PersistenceConfiguration:
       type: object
       properties:
@@ -4339,6 +4356,7 @@ components:
           - discovery
           - update_token
           - config_api_auth
+          - modify_ssa_response
         programmingLanguage:
           type: string
           enum:
@@ -4749,10 +4767,10 @@ components:
           type: array
           items:
             type: object
-        displayValue:
-          type: string
         value:
           type: object
+        displayValue:
+          type: string
     SessionId:
       type: object
       properties:
diff --git a/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml b/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml
index 4b47382ece4..c5debdf81ec 100644
--- a/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml
+++ b/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml
@@ -225,10 +225,10 @@ components:
           type: array
           items:
             type: object
-        displayValue:
-          type: string
         value:
           type: object
+        displayValue:
+          type: string
     CustomUser:
       type: object
       properties:
diff --git a/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java b/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
index f3f13484786..693e5aff380 100644
--- a/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
+++ b/jans-orm/model/src/main/java/io/jans/orm/model/base/CustomObjectAttribute.java
@@ -92,9 +92,13 @@ public String getDisplayValue() {
             return values.get(0).toString();
         }
 
-        StringBuilder sb = new StringBuilder(values.get(0).toString());
-        for (int i = 1; i < values.size(); i++) {
-            sb.append(", ").append(values.get(i).toString());
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < values.size(); i++) {
+            if(i==0) {
+                sb.append(values.get(i).toString());
+            }else {
+                sb.append(", ").append(values.get(i).toString());
+            }
         }
 
         return sb.toString();