diff --git a/app/views/epp/sessions/greeting.xml.builder b/app/views/epp/sessions/greeting.xml.builder
index b397dc5f2..50b48ef70 100644
--- a/app/views/epp/sessions/greeting.xml.builder
+++ b/app/views/epp/sessions/greeting.xml.builder
@@ -1,15 +1,37 @@
 xml.instruct!
 xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do
-  xml.svID 'EPP server (DSDng)'
-  xml.svDate '2014-06-18T17:46:59+03:00'
-  xml.version '1.0'
-  xml.lang 'en'
-  xml.lang 'cs'
-  xml.objURI 'http://www.nic.cz/xml/epp/contact-1.6'
-  xml.objURI 'http://www.nic.cz/xml/epp/domain-1.4'
-  xml.objURI 'http://www.nic.cz/xml/epp/nsset-1.2'
-  xml.objURI 'http://www.nic.cz/xml/epp/keyset-1.3'
-  xml.svcExtension do
-    xml.extURI 'http://www.nic.cz/xml/epp/enumval-1.2'
-  end
+  xml.greeting do
+    xml.svID 'EPP server (DSDng)'
+    xml.svDate '2014-06-18T17:46:59+03:00'
+    xml.svcMenu do
+      xml.version '1.0'
+      xml.lang 'en'
+      xml.lang 'cs'
+      xml.objURI 'http://www.nic.cz/xml/epp/contact-1.6'
+      xml.objURI 'http://www.nic.cz/xml/epp/domain-1.4'
+      xml.objURI 'http://www.nic.cz/xml/epp/nsset-1.2'
+      xml.objURI 'http://www.nic.cz/xml/epp/keyset-1.3'
+      xml.svcExtension do
+        xml.extURI 'http://www.nic.cz/xml/epp/enumval-1.2'
+      end
+    end
+
+    xml.dcp do
+      xml.access do
+        xml.all
+      end
+      xml.statement do
+        xml.purpose do
+          xml.admin
+          xml.prov
+        end
+        xml.recipient do
+          xml.public
+        end
+        xml.retention do
+          xml.stated
+        end
+      end
+    end
+  end #greeting
 end
diff --git a/app/views/epp/sessions/login_success.xml.builder b/app/views/epp/sessions/login_success.xml.builder
index 317be0a8d..6df074700 100644
--- a/app/views/epp/sessions/login_success.xml.builder
+++ b/app/views/epp/sessions/login_success.xml.builder
@@ -2,11 +2,11 @@ xml.instruct!
 xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do
   xml.response do
     xml.result('code' => '1000') do
-      xml.msg('Command completed successfully', 'lang' => 'en')
+      xml.msg 'Command completed successfully'
+    end
+    xml.trID do
+      xml.clTRID params[:clTRID]
+      xml.svTRID 'ccReg-0003012027'
     end
   end
-
-  xml.trID do
-    xml.clTRID params[:clTRID]
-  end
 end