diff --git a/mock.mjs b/mock.mjs
index db31832..662fe62 100644
--- a/mock.mjs
+++ b/mock.mjs
@@ -111,9 +111,8 @@ app.get("/cmk/v1/tenant1-id/groups", (req, res) => {
     res.json(groups());
 });
 
-app.get("/cmk/v1/tenant1-id/user/:id?", (req, res) => {
-    const { id } = req.params;
-    res.json(user(id));
+app.get("/cmk/v1/tenant1-id/userInfo", (req, res) => {
+    res.json(user());
 });
 
 app.get("/cmk/v1/tenant1-id/workflows/:taskId?", (req, res) => {
diff --git a/mockServer/mockdata/systems.mjs b/mockServer/mockdata/systems.mjs
index fade45c..f6fe6e0 100644
--- a/mockServer/mockdata/systems.mjs
+++ b/mockServer/mockdata/systems.mjs
@@ -96,5 +96,10 @@ export default (systemId, keyConfigurationID, operation) => {
             },
             type: "SYSTEM"
         };
+    } else if(systemId && !keyConfigurationID && operation === 'recoveryActions') {
+        return {
+            canCancel: true,
+            canRetry: false
+        };
     }
 }
\ No newline at end of file
diff --git a/mockServer/mockdata/user.mjs b/mockServer/mockdata/user.mjs
index 10f384b..86e1c7b 100644
--- a/mockServer/mockdata/user.mjs
+++ b/mockServer/mockdata/user.mjs
@@ -1,16 +1,11 @@
 import Chance from "chance";
 const chance = new Chance();
-export default (test) => {
-    const generateUser = (count) => {
-        return Array.from({ length: count }, () => (
-            {
-                id: chance.guid(),
-                name: chance.name(),
-                email: chance.email(),
-                groupName: chance.pickone(['KMS Admin', 'KMS Admin EU', 'KMS Admin US', 'KMS Auditor']),
-            }
-        ));
-
+export default () => {
+    return {
+        identifier: chance.guid(),
+        givenName: chance.name(),
+        familyName: chance.last(),
+        email: chance.email(),
+        role: chance.pickone(['KEY_ADMINISTRATOR', 'TENANT_ADMINISTRATOR', 'TENANT_AUDITOR']),
     };
-    return generateUser(test);
 }
\ No newline at end of file
diff --git a/translation_v2.json b/translation_v2.json
deleted file mode 100644
index fc1ba6b..0000000
--- a/translation_v2.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{  
-   "collections":[  
-      {  
-         "collectionName":"CMK_UI",
-         "folders":[
-            {
-               "startingFolderPath":"**/i18n/**",
-               "sourceFilters":[
-                  "*i18n_en.properties"
-               ]
-            }
-         ]
-      }
-   ],
-   "defaultConfiguration":{
-      "xlfFolderPath":"./XLF",
-      "targetFolderPath":".",
-      "pseudoLocFolderPath":".",
-      "oneQFolderPath":".",
-      "targetFileNamingConvention":"[filename]_[langCode].[extension]"
-   }
-}
diff --git a/webapp/i18n/i18n_de.properties b/webapp/i18n/i18n_de.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp/i18n/i18n_es.properties b/webapp/i18n/i18n_es.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp/i18n/i18n_fr.properties b/webapp/i18n/i18n_fr.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp/i18n/i18n_ja_JP.properties b/webapp/i18n/i18n_ja_JP.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp/i18n/i18n_pt_BR.properties b/webapp/i18n/i18n_pt_BR.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/webapp/i18n/i18n_zh_CN.properties b/webapp/i18n/i18n_zh_CN.properties
deleted file mode 100644
index e69de29..0000000