diff --git a/packages/server/src/Interface.DocumentStore.ts b/packages/server/src/Interface.DocumentStore.ts
index dd1e4263f..7eda1cc1a 100644
--- a/packages/server/src/Interface.DocumentStore.ts
+++ b/packages/server/src/Interface.DocumentStore.ts
@@ -299,8 +299,8 @@ export class DocumentStoreDTO {
     static toEntity(body: any): DocumentStore {
         const docStore = new DocumentStore()
         Object.assign(docStore, body)
-        docStore.loaders = '[]'
-        docStore.whereUsed = '[]'
+        docStore.loaders = body.loaders ?? '[]'
+        docStore.whereUsed = body.whereUsed ?? '[]'
         // when a new document store is created, it is empty and in sync
         docStore.status = DocumentStoreStatus.EMPTY_SYNC
         return docStore
diff --git a/packages/server/src/services/credentials/index.ts b/packages/server/src/services/credentials/index.ts
index 7b3625d71..89219cabe 100644
--- a/packages/server/src/services/credentials/index.ts
+++ b/packages/server/src/services/credentials/index.ts
@@ -14,6 +14,11 @@ const createCredential = async (requestBody: any) => {
     try {
         const appServer = getRunningExpressApp()
         const newCredential = await transformToCredentialEntity(requestBody)
+
+        if (requestBody.id) {
+            newCredential.id = requestBody.id
+        }
+
         const credential = await appServer.AppDataSource.getRepository(Credential).create(newCredential)
         const dbResponse = await appServer.AppDataSource.getRepository(Credential).save(credential)
         return dbResponse