diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
index 4eb543da86da468ba90b8610e31a041c7bb73518..39c67d2abfc1d300ac8e0b6085f630da3814922c 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/utils/DomUtils.java
@@ -126,10 +126,10 @@ public final class DomUtils {
      */
     public static Transformer createNewSecureTransformer() throws TransformerConfigurationException {
         TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
         // generic secure file processing
         setConfigurationOption(factory, XMLInputFactory.SUPPORT_DTD, false);
         setConfigurationOption(factory, XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
-        setConfigurationOption(factory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
         setConfigurationOption(factory, DISALLOW_DOCTYPE_FEATURE, true);
         setAttributeOption(factory, XMLConstants.ACCESS_EXTERNAL_DTD, "");
         setAttributeOption(factory, XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java
index 48af60e66177ffa9d5fd88575551192699a3b36f..3b3cf2e7cccc476bd90218ae4e9238051ef7d026 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java
@@ -198,10 +198,6 @@ public class DomainEditController {
         if (propertyRO == null || StringUtils.isBlank(propertyRO.getProperty())) {
             throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "ValidateProperty", "Property name is empty!");
         }
-        SMPDomainPropertyEnum.getByProperty(propertyRO.getProperty())
-                .orElseThrow(() -> new SMPRuntimeException(ErrorCode.INVALID_REQUEST,
-                        "ValidateProperty", "Property [" + propertyRO.getProperty() + "] is not domain property!"));
-
         return uiDomainEditService.validateDomainProperty(propertyRO);
     }