diff --git a/src/main/java/digital/slovensko/autogram/core/eforms/EFormUtils.java b/src/main/java/digital/slovensko/autogram/core/eforms/EFormUtils.java
index 7a58c8875..0387d5e6b 100644
--- a/src/main/java/digital/slovensko/autogram/core/eforms/EFormUtils.java
+++ b/src/main/java/digital/slovensko/autogram/core/eforms/EFormUtils.java
@@ -364,7 +364,7 @@ public static String fillXsdIdentifier(String formIdentifier) {
     }
 
     public static boolean isOrsrUri(String uri) {
-        return uri != null && uri.contains("://eformulare.justice.sk") || uri.contains("justice.gov.sk/");
+        return uri != null && (uri.contains("://eformulare.justice.sk") || uri.contains("justice.gov.sk/"));
     }
 
     public static String getFsFormIdFromFilename(String filename) {
diff --git a/src/main/java/digital/slovensko/autogram/core/eforms/OrsrEFormResources.java b/src/main/java/digital/slovensko/autogram/core/eforms/OrsrEFormResources.java
index 9b5804667..fd5f0783c 100644
--- a/src/main/java/digital/slovensko/autogram/core/eforms/OrsrEFormResources.java
+++ b/src/main/java/digital/slovensko/autogram/core/eforms/OrsrEFormResources.java
@@ -38,4 +38,9 @@ public boolean findResources() throws XMLValidationException {
 
         return true;
     }
+
+    @Override
+    public String getIdentifier() {
+        return "http://www.justice.gov.sk/Forms";
+    }
 }
diff --git a/src/main/java/digital/slovensko/autogram/core/eforms/xdc/XDCBuilder.java b/src/main/java/digital/slovensko/autogram/core/eforms/xdc/XDCBuilder.java
index b02de589f..b061a9a64 100644
--- a/src/main/java/digital/slovensko/autogram/core/eforms/xdc/XDCBuilder.java
+++ b/src/main/java/digital/slovensko/autogram/core/eforms/xdc/XDCBuilder.java
@@ -103,11 +103,10 @@ private static Element createXMLData(Document document, String identifierUri, St
             boolean shouldEmbedSchemas) {
         var element = document.createElement("xdc:XMLData");
         element.setAttribute("ContentType", "application/xml; charset=UTF-8");
+        element.setAttribute("Identifier", identifierUri);
 
-        if (!shouldEmbedSchemas) {
-            element.setAttribute("Identifier", identifierUri);
+        if (!shouldEmbedSchemas)
             element.setAttribute("Version", identifierVersion);
-        }
 
         return element;
     }