diff --git a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
index 8b8d94b52..7f06b72d1 100644
--- a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
+++ b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala
@@ -2045,7 +2045,7 @@ trait APIMethods200 {
               // Format the data as V2.0.0 json
               if (isSuperAdmin(userId)) {
                 // If the user is SuperAdmin add it to the list
-                json = EntitlementJSONs(JSONFactory200.createEntitlementJSONs(entitlements).list:::List(EntitlementJSON("", "SuperAdmin", "")))
+                json = addedSuperAdminEntitlementJson(entitlements)
                 successJsonResponse(Extraction.decompose(json))
               } else {
                 json = JSONFactory200.createEntitlementJSONs(entitlements)
diff --git a/obp-api/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala b/obp-api/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala
index 77eee732e..af1069f01 100644
--- a/obp-api/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala
+++ b/obp-api/src/main/scala/code/api/v2_0_0/JSONFactory2.0.0.scala
@@ -837,6 +837,10 @@ def createTransactionTypeJSON(transactionType : TransactionType) : TransactionTy
           ))
     )))
 
+  def addedSuperAdminEntitlementJson(entitlements: List[Entitlement]) = {
+    EntitlementJSONs(JSONFactory200.createEntitlementJSONs(entitlements).list ::: List(EntitlementJSON("", "SuperAdmin", "")))
+  }
+
 
 
 
diff --git a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
index 7318afd7d..5e964ace4 100644
--- a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
+++ b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala
@@ -821,7 +821,7 @@ trait APIMethods210 {
             // Format the data as V2.1.0 json
             if (isSuperAdmin(userId)) {
               // If the user is SuperAdmin add it to the list
-              json = EntitlementJSONs(JSONFactory200.createEntitlementJSONs(filteredEntitlements).list:::List(EntitlementJSON("", "SuperAdmin", "")))
+              json = JSONFactory200.addedSuperAdminEntitlementJson(filteredEntitlements)
               successJsonResponse(Extraction.decompose(json))
             } else {
               json = JSONFactory200.createEntitlementJSONs(filteredEntitlements)
diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
index 0147359b2..38135b41d 100644
--- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
+++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala
@@ -1326,7 +1326,7 @@ trait APIMethods400 {
             // Format the data as V2.0.0 json
             if (isSuperAdmin(userId)) {
               // If the user is SuperAdmin add it to the list
-              json = EntitlementJSONs(JSONFactory200.createEntitlementJSONs(entitlements).list:::List(EntitlementJSON("", "SuperAdmin", "")))
+              json = JSONFactory200.addedSuperAdminEntitlementJson(entitlements)
             } else {
               json = JSONFactory200.createEntitlementJSONs(entitlements)
             }