diff --git a/app/controllers/concerns/epp/common.rb b/app/controllers/concerns/epp/common.rb
index ef9a51eb1..1a1394822 100644
--- a/app/controllers/concerns/epp/common.rb
+++ b/app/controllers/concerns/epp/common.rb
@@ -6,6 +6,7 @@ module Epp::Common
   end
 
   def proxy
+    @svTRID = "ccReg-#{'%010d' % rand(10 ** 10)}"
     send(params[:command])
   end
 
diff --git a/app/views/epp/sessions/login_fail.xml.builder b/app/views/epp/sessions/login_fail.xml.builder
index 21d207000..0e5aee9f0 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 params[:clTRID]
+    xml.svTRID @svTRID
   end
 end
diff --git a/app/views/epp/sessions/login_success.xml.builder b/app/views/epp/sessions/login_success.xml.builder
index 6df074700..6ff17d0eb 100644
--- a/app/views/epp/sessions/login_success.xml.builder
+++ b/app/views/epp/sessions/login_success.xml.builder
@@ -6,7 +6,7 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.
     end
     xml.trID do
       xml.clTRID params[:clTRID]
-      xml.svTRID 'ccReg-0003012027'
+      xml.svTRID @svTRID
     end
   end
 end
diff --git a/app/views/epp/sessions/logout.xml.builder b/app/views/epp/sessions/logout.xml.builder
index 692e4e497..7a851129b 100644
--- a/app/views/epp/sessions/logout.xml.builder
+++ b/app/views/epp/sessions/logout.xml.builder
@@ -8,5 +8,6 @@ xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.
 
   xml.trID do
     xml.clTRID params[:clTRID]
+    xml.svTRID @svTRID
   end
 end