diff --git a/app/views/epp/domains/create.xml.builder b/app/views/epp/domains/create.xml.builder
index 5d019a5f0..2c25c01b4 100644
--- a/app/views/epp/domains/create.xml.builder
+++ b/app/views/epp/domains/create.xml.builder
@@ -5,4 +5,8 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.
       xml.msg('Command completed successfully')
     end
   end
+
+  xml.trID do
+    xml.clTRID params[:clTRID]
+  end
 end
diff --git a/app/views/epp/sessions/login_fail.xml.builder b/app/views/epp/sessions/login_fail.xml.builder
index 89dfe1b32..21d207000 100644
--- a/app/views/epp/sessions/login_fail.xml.builder
+++ b/app/views/epp/sessions/login_fail.xml.builder
@@ -7,7 +7,7 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.
   end
 
   xml.trID do
-    xml.svTRID 'svTrid'
-    xml.clTRID 'wgyn001#10-02-08at13:58:06'
+    #xml.svTRID 'svTrid'
+    xml.clTRID params[:clTRID]
   end
 end
diff --git a/app/views/epp/sessions/login_success.xml.builder b/app/views/epp/sessions/login_success.xml.builder
index 3a5c3cff4..317be0a8d 100644
--- a/app/views/epp/sessions/login_success.xml.builder
+++ b/app/views/epp/sessions/login_success.xml.builder
@@ -7,6 +7,6 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.
   end
 
   xml.trID do
-    xml.clTRID 'sample1trid'
+    xml.clTRID params[:clTRID]
   end
 end
diff --git a/app/views/epp/sessions/logout.xml.builder b/app/views/epp/sessions/logout.xml.builder
index d7e440975..692e4e497 100644
--- a/app/views/epp/sessions/logout.xml.builder
+++ b/app/views/epp/sessions/logout.xml.builder
@@ -7,6 +7,6 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.
   end
 
   xml.trID do
-    xml.clTRID 'sample1trid'
+    xml.clTRID params[:clTRID]
   end
 end
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index e5aa76dfe..0cc64c91e 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -10,6 +10,7 @@ describe 'EPP Domain', epp: true do
       response = epp_request('create_domain.xml')
       expect(response[:result_code]).to eq('1000')
       expect(response[:msg]).to eq('Command completed successfully')
+      expect(response[:clTRID]).to eq('dpbx005#10-01-29at19:21:47')
       expect(Domain.first.registrar.name).to eq('Zone Media OÜ')
     end
 
diff --git a/spec/epp/session_spec.rb b/spec/epp/session_spec.rb
index 6423e3d16..045a8fb13 100644
--- a/spec/epp/session_spec.rb
+++ b/spec/epp/session_spec.rb
@@ -19,6 +19,7 @@ describe 'EPP Session', epp: true do
       response = epp_plain_request('login.xml')
       expect(response[:result_code]).to eq('2501')
       expect(response[:msg]).to eq('Authentication error; server closing connection')
+      expect(response[:clTRID]).to eq('wgyn001#10-02-08at13:58:06')
 
       Fabricate(:epp_user, active: false)
 
@@ -30,6 +31,7 @@ describe 'EPP Session', epp: true do
       response = epp_plain_request('create_domain.xml')
       expect(response[:result_code]).to eq('2002')
       expect(response[:msg]).to eq('You need to login first.')
+      expect(response[:clTRID]).to eq('dpbx005#10-01-29at19:21:47')
     end
 
     context 'with valid user' do
@@ -39,6 +41,7 @@ describe 'EPP Session', epp: true do
         response = epp_plain_request('login.xml')
         expect(response[:result_code]).to eq('1000')
         expect(response[:msg]).to eq('Command completed successfully')
+        expect(response[:clTRID]).to eq('wgyn001#10-02-08at13:58:06')
       end
 
       it 'logs out epp user' do
diff --git a/spec/support/epp.rb b/spec/support/epp.rb
index 5331968df..866cdceff 100644
--- a/spec/support/epp.rb
+++ b/spec/support/epp.rb
@@ -17,7 +17,8 @@ module Epp
   def parse_response res
     {
       result_code: res.css('epp response result').first[:code],
-      msg: res.css('epp response result msg').text
+      msg: res.css('epp response result msg').text,
+      clTRID: res.css('epp trID clTRID').text
     }
   end