diff --git a/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java b/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java
index 9650e945a013d4b1e63e6a21d9e8644953ebb097..fec8af2e2b35cd89c5b0a9daeab8a3b643e446bd 100644
--- a/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java
+++ b/src/main/java/net/geant/nmaas/portal/service/impl/DomainGroupServiceImpl.java
@@ -64,8 +64,8 @@ public class DomainGroupServiceImpl implements DomainGroupService {
         domainGroupEntity = domainGroupRepository.save(domainGroupEntity);
 
         //call existing webhooks
-        DomainGroupView domainGroupView = modelMapper.map(domainGroupEntity, DomainGroupView.class);
-        webhookEventRepository.findIdByEventType(WebhookEventType.DOMAIN_GROUP_CHANGE).forEach(id -> scheduleManager.createOneTimeJob(DomainGroupJob.class, "DomainGroup_" + id + "_" + domainGroupView.getId() + "_" + LocalDateTime.now(), Map.of("webhookId", id, "action", "create", "domainGroup", domainGroupView)));
+        //DomainGroupView domainGroupView = modelMapper.map(domainGroupEntity, DomainGroupView.class);
+        //webhookEventRepository.findIdByEventType(WebhookEventType.DOMAIN_GROUP_CHANGE).forEach(id -> scheduleManager.createOneTimeJob(DomainGroupJob.class, "DomainGroup_" + id + "_" + domainGroupView.getId() + "_" + LocalDateTime.now(), Map.of("webhookId", id, "action", "create", "domainGroup", domainGroupView)));
         return modelMapper.map(domainGroupEntity, DomainGroupView.class);
     }
 
diff --git a/src/test/shell/data/i18n/de.json b/src/test/shell/data/i18n/de.json
index 1952c451589fd40029f35fc101f6a58dff65ef96..3c41aede4d90d8ebf6629eb2403fc703ec43c86d 100644
--- a/src/test/shell/data/i18n/de.json
+++ b/src/test/shell/data/i18n/de.json
@@ -1327,7 +1327,7 @@
     "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
-    "SAVE" : "Save webhook",
-    "REMOVE" : "Remove webhook"
+    "SAVE" : "Save",
+    "REMOVE" : "Remove"
   }
 }
diff --git a/src/test/shell/data/i18n/en.json b/src/test/shell/data/i18n/en.json
index a1d6c311a5a16192d88399983eb9273c8380291a..d3c53fa9cb8cadcf0ff094629360a2b88a501516 100644
--- a/src/test/shell/data/i18n/en.json
+++ b/src/test/shell/data/i18n/en.json
@@ -1322,7 +1322,7 @@
     "TITLE_SHORT" : "Webhooks",
     "ID" : "Id",
     "NAME" : "Name",
-    "TARGET_URL" : "Target Url",
+    "TARGET_URL" : "Target url",
     "TYPE" : "Webhook type",
     "TOKEN" : "Token value",
     "AUTH" : "Authorization header",
@@ -1332,7 +1332,7 @@
     "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
-    "SAVE" : "Save webhook",
-    "REMOVE" : "Remove webhook"
+    "SAVE" : "Save",
+    "REMOVE" : "Remove"
   }
 }
diff --git a/src/test/shell/data/i18n/fr.json b/src/test/shell/data/i18n/fr.json
index f17ba3fb15a9217887a5f85860d6bf5bfd5f68f1..bb3d002a589907554502336bf0e76009455c20a1 100644
--- a/src/test/shell/data/i18n/fr.json
+++ b/src/test/shell/data/i18n/fr.json
@@ -1331,7 +1331,7 @@
     "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
-    "SAVE" : "Save webhook",
-    "REMOVE" : "Remove webhook"
+    "SAVE" : "Save",
+    "REMOVE" : "Remove"
   }
 }
diff --git a/src/test/shell/data/i18n/pl.json b/src/test/shell/data/i18n/pl.json
index 9785607ab4e623d9e9818e8d17cca4236e55bd66..251192c6f1fd5f0dea948567c3a94f5ae67d4ef7 100644
--- a/src/test/shell/data/i18n/pl.json
+++ b/src/test/shell/data/i18n/pl.json
@@ -1331,7 +1331,7 @@
     "DOMAIN_GROUP_CHANGE" : "Domain group change",
     "NEW" : "Add webhook",
     "DETAILS" : "Webhooks details",
-    "SAVE" : "Save webhook",
-    "REMOVE" : "Remove webhook"
+    "SAVE" : "Save",
+    "REMOVE" : "Remove"
   }
 }