diff --git a/config/locales/en.yml b/config/locales/en.yml
index 14001f82c..3f208027f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -142,9 +142,9 @@ en:
           attributes:
             contact:
               blank: 'Contact was not found'
-              taken: 'Contact already exists on this domain!'
+              taken: 'Contact already exists on this domain'
             contact_code_cache:
-              taken: 'Contact already exists on this domain!'
+              taken: 'Contact already exists on this domain'
 
         domain_status:
           attributes:
@@ -315,7 +315,7 @@ en:
   back_to_domain: 'Back to domain'
   edit_domain: 'Edit domain'
   contact_was_not_found: 'Contact was not found!'
-  contact_already_exists: 'Contact already exists on this domain!'
+  contact_already_exists: 'Contact already exists on this domain'
   failed_to_add_contact: 'Failed to add contact!'
   contact_added: 'Contact added!'
   contact_detached: 'Contact detached!'
diff --git a/doc/epp-examples.md b/doc/epp-examples.md
index 5969445ab..a4fd22efe 100644
--- a/doc/epp-examples.md
+++ b/doc/epp-examples.md
@@ -1,5 +1,5 @@
 # EPP REQUEST - RESPONSE EXAMPLES
-GENERATED AT: 2015-01-21 16:16:32 +0200  
+GENERATED AT: 2015-01-21 17:33:14 +0200  
 EXAMPLE COUNT: 104  
 
 ---
@@ -32,7 +32,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0415961418</svTRID>
+  <svTRID>ccReg-7864710779</svTRID>
 </trID>
 </epp>
 ```
@@ -84,7 +84,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5545672045</svTRID>
+  <svTRID>ccReg-9604172563</svTRID>
 </trID>
 </epp>
 ```
@@ -128,13 +128,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>57e1d053</id>
-        <crDate>2015-01-21 14:16:33 UTC</crDate>
+        <id>f3565470</id>
+        <crDate>2015-01-21 15:33:15 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1186498137</svTRID>
+  <svTRID>ccReg-5765931859</svTRID>
 </trID>
   </response>
 </epp>
@@ -179,13 +179,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>16b38267</id>
-        <crDate>2015-01-21 14:16:34 UTC</crDate>
+        <id>ce7ca63e</id>
+        <crDate>2015-01-21 15:33:16 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8225552533</svTRID>
+  <svTRID>ccReg-9032697119</svTRID>
 </trID>
   </response>
 </epp>
@@ -230,13 +230,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>ef7ab7c7</id>
-        <crDate>2015-01-21 14:16:34 UTC</crDate>
+        <id>30850f41</id>
+        <crDate>2015-01-21 15:33:16 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0277110343</svTRID>
+  <svTRID>ccReg-8358611153</svTRID>
 </trID>
   </response>
 </epp>
@@ -281,13 +281,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>3dfbb237</id>
-        <crDate>2015-01-21 14:16:35 UTC</crDate>
+        <id>c1b7ec43</id>
+        <crDate>2015-01-21 15:33:16 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5915568719</svTRID>
+  <svTRID>ccReg-2527491147</svTRID>
 </trID>
   </response>
 </epp>
@@ -340,13 +340,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>6c69f945</id>
-        <crDate>2015-01-21 14:16:35 UTC</crDate>
+        <id>4c494f49</id>
+        <crDate>2015-01-21 15:33:17 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5585374718</svTRID>
+  <svTRID>ccReg-7826404364</svTRID>
 </trID>
   </response>
 </epp>
@@ -395,13 +395,13 @@ RESPONSE:
     </result>
     <resData>
       <creData>
-        <id>61480b34</id>
-        <crDate>2015-01-21 14:16:36 UTC</crDate>
+        <id>dbe36770</id>
+        <crDate>2015-01-21 15:33:17 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7682232705</svTRID>
+  <svTRID>ccReg-9149336059</svTRID>
 </trID>
   </response>
 </epp>
@@ -438,7 +438,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7696402007</svTRID>
+  <svTRID>ccReg-0535831857</svTRID>
 </trID>
 </epp>
 ```
@@ -487,7 +487,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1650550527</svTRID>
+  <svTRID>ccReg-9540146784</svTRID>
 </trID>
 </epp>
 ```
@@ -536,12 +536,12 @@ RESPONSE:
     <resData>
       <creData>
         <id>sh8013</id>
-        <crDate>2015-01-21 14:16:37 UTC</crDate>
+        <crDate>2015-01-21 15:33:18 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6771284373</svTRID>
+  <svTRID>ccReg-4650915356</svTRID>
 </trID>
   </response>
 </epp>
@@ -594,7 +594,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4109374852</svTRID>
+  <svTRID>ccReg-5523716030</svTRID>
 </trID>
 </epp>
 ```
@@ -643,12 +643,12 @@ RESPONSE:
     <resData>
       <creData>
         <id>sh8013</id>
-        <crDate>2015-01-21 14:16:38 UTC</crDate>
+        <crDate>2015-01-21 15:33:19 UTC</crDate>
       </creData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1400303232</svTRID>
+  <svTRID>ccReg-5298158240</svTRID>
 </trID>
   </response>
 </epp>
@@ -684,7 +684,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1793388207</svTRID>
+  <svTRID>ccReg-5117507065</svTRID>
 </trID>
 </epp>
 ```
@@ -718,7 +718,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9455406192</svTRID>
+  <svTRID>ccReg-9436615595</svTRID>
 </trID>
   </response>
 </epp>
@@ -760,7 +760,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2274662962</svTRID>
+  <svTRID>ccReg-8711299427</svTRID>
 </trID>
 </epp>
 ```
@@ -795,7 +795,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8828374476</svTRID>
+  <svTRID>ccReg-9832127526</svTRID>
 </trID>
 </epp>
 ```
@@ -830,7 +830,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6839266719</svTRID>
+  <svTRID>ccReg-1137823703</svTRID>
 </trID>
 </epp>
 ```
@@ -876,7 +876,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8831656850</svTRID>
+  <svTRID>ccReg-8248158634</svTRID>
 </trID>
   </response>
 </epp>
@@ -916,14 +916,14 @@ RESPONSE:
   <name>Johnny Awesome</name>
   <org/>
   <addr>
-    <street>Joanny Parks</street>
-    <city>Lockmanport</city>
+    <street>Kip Village</street>
+    <city>Lake Maryam</city>
   </addr>
 </postalInfo>
         <voice>+372.12345678</voice>
         <fax/>
-        <email>helena@robel.name</email>
-        <crDate>2015-01-21 14:16:41 UTC</crDate>
+        <email>cara@leannon.net</email>
+        <crDate>2015-01-21 15:33:22 UTC</crDate>
         <ident type="op">37605030299</ident>
         <authInfo>
           <pw>asde</pw>
@@ -942,7 +942,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7831471890</svTRID>
+  <svTRID>ccReg-3413288478</svTRID>
 </trID>
   </response>
 </epp>
@@ -981,7 +981,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5547243329</svTRID>
+  <svTRID>ccReg-6438885596</svTRID>
 </trID>
 </epp>
 ```
@@ -1022,7 +1022,7 @@ RESPONSE:
 <postalInfo type="int">
   <org/>
 </postalInfo>
-        <crDate>2015-01-21 14:16:41 UTC</crDate>
+        <crDate>2015-01-21 15:33:23 UTC</crDate>
         <ident type="op">37605030299</ident>
 <disclose flag="0">
   <name/>
@@ -1038,7 +1038,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4469393835</svTRID>
+  <svTRID>ccReg-8827932199</svTRID>
 </trID>
   </response>
 </epp>
@@ -1078,14 +1078,14 @@ RESPONSE:
   <name>Johnny Awesome</name>
   <org/>
   <addr>
-    <street>Joanny Parks</street>
-    <city>Lockmanport</city>
+    <street>Kip Village</street>
+    <city>Lake Maryam</city>
   </addr>
 </postalInfo>
         <voice>+372.12345678</voice>
         <fax/>
-        <email>helena@robel.name</email>
-        <crDate>2015-01-21 14:16:42 UTC</crDate>
+        <email>cara@leannon.net</email>
+        <crDate>2015-01-21 15:33:24 UTC</crDate>
         <ident type="op">37605030299</ident>
         <authInfo>
           <pw>password</pw>
@@ -1104,7 +1104,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4987956623</svTRID>
+  <svTRID>ccReg-6914805306</svTRID>
 </trID>
   </response>
 </epp>
@@ -1140,7 +1140,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2174218272</svTRID>
+  <svTRID>ccReg-9153539057</svTRID>
 </trID>
 </epp>
 ```
@@ -1181,7 +1181,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4718251837</svTRID>
+  <svTRID>ccReg-6074549585</svTRID>
 </trID>
 </epp>
 ```
@@ -1220,14 +1220,14 @@ RESPONSE:
   <name>Johnny Awesome</name>
   <org/>
   <addr>
-    <street>Joanny Parks</street>
-    <city>Lockmanport</city>
+    <street>Kip Village</street>
+    <city>Lake Maryam</city>
   </addr>
 </postalInfo>
         <voice>+372.12345678</voice>
         <fax/>
-        <email>helena@robel.name</email>
-        <crDate>2015-01-21 14:16:43 UTC</crDate>
+        <email>cara@leannon.net</email>
+        <crDate>2015-01-21 15:33:25 UTC</crDate>
         <ident type="op">37605030299</ident>
         <authInfo>
           <pw>ccds4324pok</pw>
@@ -1246,7 +1246,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6157937090</svTRID>
+  <svTRID>ccReg-8430288078</svTRID>
 </trID>
   </response>
 </epp>
@@ -1286,10 +1286,10 @@ RESPONSE:
       <chkData>
         <id>info-4444</id>
 <postalInfo type="int">
-  <name>Louisa Osinski</name>
+  <name>Emily Runte</name>
   <org/>
 </postalInfo>
-        <crDate>2015-01-21 14:16:43 UTC</crDate>
+        <crDate>2015-01-21 15:33:25 UTC</crDate>
         <ident type="op">37605030299</ident>
 <disclose flag="0">
   <email/>
@@ -1305,7 +1305,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9601425599</svTRID>
+  <svTRID>ccReg-8019393413</svTRID>
 </trID>
   </response>
 </epp>
@@ -1341,7 +1341,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1542657839</svTRID>
+  <svTRID>ccReg-3933702638</svTRID>
 </trID>
 </epp>
 ```
@@ -1379,7 +1379,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4494383330</svTRID>
+  <svTRID>ccReg-7002325617</svTRID>
 </trID>
 </epp>
 ```
@@ -1417,7 +1417,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8589717445</svTRID>
+  <svTRID>ccReg-6391246300</svTRID>
 </trID>
 </epp>
 ```
@@ -1489,7 +1489,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1902636323</svTRID>
+  <svTRID>ccReg-6522455540</svTRID>
 </trID>
 </epp>
 ```
@@ -1533,7 +1533,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6382642257</svTRID>
+  <svTRID>ccReg-6812325144</svTRID>
 </trID>
 </epp>
 ```
@@ -1574,7 +1574,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2556152893</svTRID>
+  <svTRID>ccReg-6866271694</svTRID>
 </trID>
   </response>
 </epp>
@@ -1615,7 +1615,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1369952216</svTRID>
+  <svTRID>ccReg-2761646860</svTRID>
 </trID>
   </response>
 </epp>
@@ -1665,7 +1665,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7825719737</svTRID>
+  <svTRID>ccReg-5008717900</svTRID>
 </trID>
   </response>
 </epp>
@@ -1712,7 +1712,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0884303645</svTRID>
+  <svTRID>ccReg-9446802782</svTRID>
 </trID>
   </response>
 </epp>
@@ -1754,7 +1754,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8630794437</svTRID>
+  <svTRID>ccReg-1350047074</svTRID>
 </trID>
 </epp>
 ```
@@ -1771,7 +1771,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">f00d6a865da167268fa29f63f3cd8ec0</domain:pw>
+          <domain:pw roid="JD1234-REP">2ee7a71a028cd9c9bef174c45cff8e3b</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1794,16 +1794,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>serverApproved</trStatus>
         <reID>123</reID>
-        <reDate>2015-01-21 14:16:47 UTC</reDate>
+        <reDate>2015-01-21 15:33:29 UTC</reDate>
         <acID>12345678</acID>
-        <acDate>2015-01-21 14:16:47 UTC</acDate>
+        <acDate>2015-01-21 15:33:29 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7511492934</svTRID>
+  <svTRID>ccReg-2101281702</svTRID>
 </trID>
 </epp>
 ```
@@ -1818,7 +1818,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">ec8e7e8ab8f5e4113f5630f7fd7793cc</domain:pw>
+          <domain:pw roid="JD1234-REP">72c7d8ef47b6d10c681dd9c88f5ded76</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1841,16 +1841,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>pending</trStatus>
         <reID>12345678</reID>
-        <reDate>2015-01-21 14:16:48 UTC</reDate>
+        <reDate>2015-01-21 15:33:29 UTC</reDate>
         <acID>123</acID>
-        <acDate>2015-01-21 15:16:48 UTC</acDate>
+        <acDate>2015-01-21 16:33:29 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8388474923</svTRID>
+  <svTRID>ccReg-5723480010</svTRID>
 </trID>
 </epp>
 ```
@@ -1865,7 +1865,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">ec8e7e8ab8f5e4113f5630f7fd7793cc</domain:pw>
+          <domain:pw roid="JD1234-REP">72c7d8ef47b6d10c681dd9c88f5ded76</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -1888,16 +1888,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>pending</trStatus>
         <reID>12345678</reID>
-        <reDate>2015-01-21 14:16:48 UTC</reDate>
+        <reDate>2015-01-21 15:33:29 UTC</reDate>
         <acID>123</acID>
-        <acDate>2015-01-21 15:16:48 UTC</acDate>
+        <acDate>2015-01-21 16:33:29 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6658465477</svTRID>
+  <svTRID>ccReg-8300649043</svTRID>
 </trID>
 </epp>
 ```
@@ -1924,7 +1924,7 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="1" id="1">
-      <qDate>2015-01-21 14:16:48 UTC</qDate>
+      <qDate>2015-01-21 15:33:29 UTC</qDate>
       <msg>Transfer requested.</msg>
     </msgQ>
     <resData>
@@ -1932,15 +1932,15 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>pending</trStatus>
         <reID>12345678</reID>
-        <reDate>2015-01-21 14:16:48 UTC</reDate>
+        <reDate>2015-01-21 15:33:29 UTC</reDate>
         <acID>123</acID>
-        <acDate>2015-01-21 15:16:48 UTC</acDate>
+        <acDate>2015-01-21 16:33:29 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6116429796</svTRID>
+  <svTRID>ccReg-8524015677</svTRID>
 </trID>
   </response>
 </epp>
@@ -1970,7 +1970,7 @@ RESPONSE:
     <msgQ count="0" id="1"/>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6364364865</svTRID>
+  <svTRID>ccReg-2436214419</svTRID>
 </trID>
   </response>
 </epp>
@@ -1988,7 +1988,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">8af2332aa8b2a951569d4aef8eb465f7</domain:pw>
+          <domain:pw roid="JD1234-REP">13ba1f8cec0a9fc7b3b980939b40ce5c</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2009,7 +2009,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3477061030</svTRID>
+  <svTRID>ccReg-4833316086</svTRID>
 </trID>
 </epp>
 ```
@@ -2026,7 +2026,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">9406186c283d41b67adb664cd449fc66</domain:pw>
+          <domain:pw roid="JD1234-REP">3166ee73db5be10c4cb20febfbc324b1</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2049,16 +2049,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>clientApproved</trStatus>
         <reID>123</reID>
-        <reDate>2015-01-21 14:16:49 UTC</reDate>
+        <reDate>2015-01-21 15:33:30 UTC</reDate>
         <acID>12345678</acID>
-        <acDate>2015-01-21 14:16:49 UTC</acDate>
+        <acDate>2015-01-21 15:33:31 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8232240686</svTRID>
+  <svTRID>ccReg-1009655832</svTRID>
 </trID>
 </epp>
 ```
@@ -2096,7 +2096,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6553037857</svTRID>
+  <svTRID>ccReg-0385395756</svTRID>
 </trID>
 </epp>
 ```
@@ -2113,7 +2113,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">8a4146c393fdd8b428765baeb001773b</domain:pw>
+          <domain:pw roid="JD1234-REP">7e499b8bbdf4940de928b3f38c54b2d1</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2134,7 +2134,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4758911735</svTRID>
+  <svTRID>ccReg-6274922242</svTRID>
 </trID>
 </epp>
 ```
@@ -2172,7 +2172,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0350571156</svTRID>
+  <svTRID>ccReg-7391171852</svTRID>
 </trID>
 </epp>
 ```
@@ -2210,7 +2210,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5272127485</svTRID>
+  <svTRID>ccReg-8776098590</svTRID>
 </trID>
 </epp>
 ```
@@ -2246,7 +2246,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6078068156</svTRID>
+  <svTRID>ccReg-6369780753</svTRID>
 </trID>
 </epp>
 ```
@@ -2263,7 +2263,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">4fec0fc9d59abbff5f46117261aea6f6</domain:pw>
+          <domain:pw roid="JD1234-REP">845d2c1dba5315440c4e69abe279f2c0</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2291,16 +2291,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>serverApproved</trStatus>
         <reID>123</reID>
-        <reDate>2015-01-21 14:16:51 UTC</reDate>
+        <reDate>2015-01-21 15:33:33 UTC</reDate>
         <acID>12345678</acID>
-        <acDate>2015-01-21 14:16:51 UTC</acDate>
+        <acDate>2015-01-21 15:33:33 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7499919263</svTRID>
+  <svTRID>ccReg-8432050009</svTRID>
 </trID>
 </epp>
 ```
@@ -2317,7 +2317,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">ed51877e8e96f9934359f6726accf638</domain:pw>
+          <domain:pw roid="JD1234-REP">1ef237651737324651e6199b9c4cac9c</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2345,16 +2345,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>pending</trStatus>
         <reID>123</reID>
-        <reDate>2015-01-21 14:16:52 UTC</reDate>
+        <reDate>2015-01-21 15:33:34 UTC</reDate>
         <acID>12345678</acID>
-        <acDate>2015-01-21 15:16:52 UTC</acDate>
+        <acDate>2015-01-21 16:33:34 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7008276389</svTRID>
+  <svTRID>ccReg-6287231116</svTRID>
 </trID>
 </epp>
 ```
@@ -2369,7 +2369,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">ed51877e8e96f9934359f6726accf638</domain:pw>
+          <domain:pw roid="JD1234-REP">1ef237651737324651e6199b9c4cac9c</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2397,16 +2397,16 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>pending</trStatus>
         <reID>123</reID>
-        <reDate>2015-01-21 14:16:52 UTC</reDate>
+        <reDate>2015-01-21 15:33:34 UTC</reDate>
         <acID>12345678</acID>
-        <acDate>2015-01-21 15:16:52 UTC</acDate>
+        <acDate>2015-01-21 16:33:34 UTC</acDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </trnData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2040819091</svTRID>
+  <svTRID>ccReg-3382804710</svTRID>
 </trID>
 </epp>
 ```
@@ -2423,7 +2423,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">5310e10dcf8c2f4f8c290e1c07df3f8d</domain:pw>
+          <domain:pw roid="JD1234-REP">0ab80010b6abffeffc64a8db225d6e6a</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2449,7 +2449,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4324472207</svTRID>
+  <svTRID>ccReg-5734566540</svTRID>
 </trID>
 </epp>
 ```
@@ -2464,7 +2464,7 @@ REQUEST:
       <domain:transfer xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.ee</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">5310e10dcf8c2f4f8c290e1c07df3f8d</domain:pw>
+          <domain:pw roid="JD1234-REP">0ab80010b6abffeffc64a8db225d6e6a</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>
@@ -2492,7 +2492,7 @@ RESPONSE:
         <name>example.ee</name>
         <trStatus>clientRejected</trStatus>
         <reID>123</reID>
-        <reDate>2015-01-21 14:16:52 UTC</reDate>
+        <reDate>2015-01-21 15:33:34 UTC</reDate>
         <acID>12345678</acID>
         <acDate/>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
@@ -2501,7 +2501,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6539038896</svTRID>
+  <svTRID>ccReg-3101825052</svTRID>
 </trID>
 </epp>
 ```
@@ -2564,14 +2564,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:16:53 UTC</crDate>
+        <crDate>2015-01-21 15:33:35 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9149671535</svTRID>
+  <svTRID>ccReg-6942718555</svTRID>
 </trID>
 </epp>
 ```
@@ -2626,14 +2626,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:16:53 UTC</crDate>
+        <crDate>2015-01-21 15:33:35 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3814173213</svTRID>
+  <svTRID>ccReg-3615366242</svTRID>
 </trID>
 </epp>
 ```
@@ -2696,14 +2696,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>ria.ee</name>
-        <crDate>2015-01-21 14:16:54 UTC</crDate>
+        <crDate>2015-01-21 15:33:36 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5497079888</svTRID>
+  <svTRID>ccReg-2307292767</svTRID>
 </trID>
 </epp>
 ```
@@ -2764,7 +2764,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5557797697</svTRID>
+  <svTRID>ccReg-7771286810</svTRID>
 </trID>
 </epp>
 ```
@@ -2827,14 +2827,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:16:55 UTC</crDate>
+        <crDate>2015-01-21 15:33:37 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8354683894</svTRID>
+  <svTRID>ccReg-6125755295</svTRID>
 </trID>
 </epp>
 ```
@@ -2898,7 +2898,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2101972617</svTRID>
+  <svTRID>ccReg-0554600118</svTRID>
 </trID>
 </epp>
 ```
@@ -2964,7 +2964,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3526632012</svTRID>
+  <svTRID>ccReg-6823167468</svTRID>
 </trID>
 </epp>
 ```
@@ -3027,7 +3027,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2755543873</svTRID>
+  <svTRID>ccReg-9469967592</svTRID>
 </trID>
 </epp>
 ```
@@ -3084,7 +3084,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3618470021</svTRID>
+  <svTRID>ccReg-3157654643</svTRID>
 </trID>
 </epp>
 ```
@@ -3181,7 +3181,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4885611470</svTRID>
+  <svTRID>ccReg-4726007073</svTRID>
 </trID>
 </epp>
 ```
@@ -3251,7 +3251,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5867008196</svTRID>
+  <svTRID>ccReg-5404951988</svTRID>
 </trID>
 </epp>
 ```
@@ -3308,7 +3308,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7077322700</svTRID>
+  <svTRID>ccReg-9477008063</svTRID>
 </trID>
 </epp>
 ```
@@ -3366,14 +3366,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:16:58 UTC</crDate>
+        <crDate>2015-01-21 15:33:40 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9477510095</svTRID>
+  <svTRID>ccReg-7542239742</svTRID>
 </trID>
 </epp>
 ```
@@ -3440,7 +3440,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3072315675</svTRID>
+  <svTRID>ccReg-8221335281</svTRID>
 </trID>
 </epp>
 ```
@@ -3503,14 +3503,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:16:59 UTC</crDate>
+        <crDate>2015-01-21 15:33:40 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1294059799</svTRID>
+  <svTRID>ccReg-6447615337</svTRID>
 </trID>
 </epp>
 ```
@@ -3576,7 +3576,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0073869502</svTRID>
+  <svTRID>ccReg-8550486970</svTRID>
 </trID>
 </epp>
 ```
@@ -3651,14 +3651,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:16:59 UTC</crDate>
+        <crDate>2015-01-21 15:33:41 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1882420234</svTRID>
+  <svTRID>ccReg-4733027521</svTRID>
 </trID>
 </epp>
 ```
@@ -3769,7 +3769,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8910276324</svTRID>
+  <svTRID>ccReg-2071732563</svTRID>
 </trID>
 </epp>
 ```
@@ -3841,7 +3841,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0189490140</svTRID>
+  <svTRID>ccReg-6965602670</svTRID>
 </trID>
 </epp>
 ```
@@ -3910,7 +3910,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9570795070</svTRID>
+  <svTRID>ccReg-4236121367</svTRID>
 </trID>
 </epp>
 ```
@@ -3973,14 +3973,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:17:01 UTC</crDate>
+        <crDate>2015-01-21 15:33:43 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2360218659</svTRID>
+  <svTRID>ccReg-2288571447</svTRID>
 </trID>
 </epp>
 ```
@@ -4049,14 +4049,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:17:02 UTC</crDate>
+        <crDate>2015-01-21 15:33:44 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9556555231</svTRID>
+  <svTRID>ccReg-7120526811</svTRID>
 </trID>
 </epp>
 ```
@@ -4125,7 +4125,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5561053539</svTRID>
+  <svTRID>ccReg-9665843969</svTRID>
 </trID>
 </epp>
 ```
@@ -4194,7 +4194,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2431144347</svTRID>
+  <svTRID>ccReg-8825042179</svTRID>
 </trID>
 </epp>
 ```
@@ -4257,7 +4257,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6489155304</svTRID>
+  <svTRID>ccReg-0989864438</svTRID>
 </trID>
 </epp>
 ```
@@ -4318,14 +4318,14 @@ RESPONSE:
     <resData>
       <creData>
         <name>example.ee</name>
-        <crDate>2015-01-21 14:17:03 UTC</crDate>
+        <crDate>2015-01-21 15:33:45 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
       </creData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4857148637</svTRID>
+  <svTRID>ccReg-2990850681</svTRID>
 </trID>
 </epp>
 ```
@@ -4386,7 +4386,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6660093673</svTRID>
+  <svTRID>ccReg-5081316062</svTRID>
 </trID>
 </epp>
 ```
@@ -4450,7 +4450,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-3727569032</svTRID>
+  <svTRID>ccReg-8013972833</svTRID>
 </trID>
 </epp>
 ```
@@ -4492,7 +4492,7 @@ RESPONSE:
     </resData>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0819988106</svTRID>
+  <svTRID>ccReg-1886893293</svTRID>
 </trID>
   </response>
 </epp>
@@ -4533,7 +4533,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1495960310</svTRID>
+  <svTRID>ccReg-1641789909</svTRID>
 </trID>
 </epp>
 ```
@@ -4573,7 +4573,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2594179701</svTRID>
+  <svTRID>ccReg-0331274718</svTRID>
 </trID>
 </epp>
 ```
@@ -4612,36 +4612,36 @@ RESPONSE:
       <infData>
         <name>example.ee</name>
         <status s="ok"/>
-        <registrant>sh0637</registrant>
-        <contact type="tech">sh0637</contact>
-        <contact type="admin">sh4751</contact>
+        <registrant>sh2935</registrant>
+        <contact type="tech">sh2935</contact>
+        <contact type="admin">sh1807</contact>
         <ns>
           <hostAttr>
-            <hostName>ns.turcotte48.ee</hostName>
+            <hostName>ns.halvorson48.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.hayes49.ee</hostName>
+            <hostName>ns.hermistonschneider49.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.harrisharris50.ee</hostName>
+            <hostName>ns.dickinson50.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
         </ns>
         <clID>Registrar OÜ</clID>
         <crID>Registrar OÜ</crID>
-        <crDate>2015-01-21 14:17:06 UTC</crDate>
+        <crDate>2015-01-21 15:33:48 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
         <authInfo>
-          <pw>b60203d5ef1506de5bcd915b1707a824</pw>
+          <pw>d8b743d628bc988cffc5c5d5a18e72e5</pw>
         </authInfo>
       </infData>
     </resData>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4492301884</svTRID>
+  <svTRID>ccReg-2306356098</svTRID>
 </trID>
 </epp>
 ```
@@ -4680,20 +4680,20 @@ RESPONSE:
       <infData>
         <name>example.ee</name>
         <status s="clientHold">Payment overdue.</status>
-        <registrant>sh8527</registrant>
-        <contact type="tech">sh8527</contact>
-        <contact type="admin">sh7810</contact>
+        <registrant>sh3876</registrant>
+        <contact type="tech">sh3876</contact>
+        <contact type="admin">sh1658</contact>
         <ns>
           <hostAttr>
-            <hostName>ns.ryanstracke51.ee</hostName>
+            <hostName>ns.dooley51.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.hackett52.ee</hostName>
+            <hostName>ns.bednar52.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.jones53.ee</hostName>
+            <hostName>ns.johns53.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
@@ -4704,10 +4704,10 @@ RESPONSE:
         </ns>
         <clID>Registrar OÜ</clID>
         <crID>Registrar OÜ</crID>
-        <crDate>2015-01-21 14:17:06 UTC</crDate>
+        <crDate>2015-01-21 15:33:48 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
         <authInfo>
-          <pw>e180d5b4d3fe09721e41892ceb095b81</pw>
+          <pw>de78f24756d8f1f7c746bc9a484c8085</pw>
         </authInfo>
       </infData>
     </resData>
@@ -4742,7 +4742,7 @@ RESPONSE:
   </extension>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5679501461</svTRID>
+  <svTRID>ccReg-1670046766</svTRID>
 </trID>
 </epp>
 ```
@@ -4779,20 +4779,20 @@ RESPONSE:
       <infData>
         <name>example.ee</name>
         <status s="clientHold">Payment overdue.</status>
-        <registrant>sh8527</registrant>
-        <contact type="tech">sh8527</contact>
-        <contact type="admin">sh7810</contact>
+        <registrant>sh3876</registrant>
+        <contact type="tech">sh3876</contact>
+        <contact type="admin">sh1658</contact>
         <ns>
           <hostAttr>
-            <hostName>ns.ryanstracke51.ee</hostName>
+            <hostName>ns.dooley51.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.hackett52.ee</hostName>
+            <hostName>ns.bednar52.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
-            <hostName>ns.jones53.ee</hostName>
+            <hostName>ns.johns53.ee</hostName>
             <hostAddr ip="v4">192.168.1.1</hostAddr>
           </hostAttr>
           <hostAttr>
@@ -4803,11 +4803,11 @@ RESPONSE:
         </ns>
         <clID>Registrar OÜ</clID>
         <crID>Registrar OÜ</crID>
-        <crDate>2015-01-21 14:17:06 UTC</crDate>
+        <crDate>2015-01-21 15:33:48 UTC</crDate>
         <exDate>2016-01-21 00:00:00 UTC</exDate>
-        <upDate>2015-01-21 14:17:07 UTC</upDate>
+        <upDate>2015-01-21 15:33:48 UTC</upDate>
         <authInfo>
-          <pw>e180d5b4d3fe09721e41892ceb095b81</pw>
+          <pw>de78f24756d8f1f7c746bc9a484c8085</pw>
         </authInfo>
       </infData>
     </resData>
@@ -4842,7 +4842,7 @@ RESPONSE:
   </extension>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5138691648</svTRID>
+  <svTRID>ccReg-7508597125</svTRID>
 </trID>
 </epp>
 ```
@@ -4883,7 +4883,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4540138549</svTRID>
+  <svTRID>ccReg-6492057629</svTRID>
 </trID>
 </epp>
 ```
@@ -4952,7 +4952,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1653631756</svTRID>
+  <svTRID>ccReg-0410038578</svTRID>
 </trID>
 </epp>
 ```
@@ -5016,7 +5016,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8639729861</svTRID>
+  <svTRID>ccReg-4620156338</svTRID>
 </trID>
 </epp>
 ```
@@ -5087,7 +5087,7 @@ RESPONSE:
       </value>
     </result>
     <result code="2302">
-      <msg lang="en">Contact already exists on this domain!</msg>
+      <msg lang="en">Contact already exists on this domain</msg>
       <value>
         <contact>mak21</contact>
       </value>
@@ -5119,7 +5119,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0108371053</svTRID>
+  <svTRID>ccReg-7673229414</svTRID>
 </trID>
 </epp>
 ```
@@ -5185,7 +5185,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-5588588028</svTRID>
+  <svTRID>ccReg-3152759881</svTRID>
 </trID>
 </epp>
 ```
@@ -5236,7 +5236,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-4181423300</svTRID>
+  <svTRID>ccReg-4742122774</svTRID>
 </trID>
 </epp>
 ```
@@ -5302,7 +5302,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0816518164</svTRID>
+  <svTRID>ccReg-4592048037</svTRID>
 </trID>
 </epp>
 ```
@@ -5343,7 +5343,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9133721118</svTRID>
+  <svTRID>ccReg-8772014666</svTRID>
 </trID>
 </epp>
 ```
@@ -5362,49 +5362,10 @@ REQUEST:
         <domain:add>
           <domain:ns>
             <domain:hostAttr>
-              <domain:hostName>ns1.example.com</domain:hostName>
-            </domain:hostAttr>
-          </domain:ns>
-        </domain:add>
-      </domain:update>
-    </update>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
-```
-
-RESPONSE:
-
-```xml
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd">
-  <response>
-    <result code="1000">
-      <msg>Command completed successfully</msg>
-    </result>
-  </response>
-<trID>
-  <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0458825204</svTRID>
-</trID>
-</epp>
-```
-
-REQUEST:
-
-```xml
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <update>
-      <domain:update xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.ee</domain:name>
-        <domain:add>
-          <domain:ns>
-            <domain:hostAttr>
-              <domain:hostName>ns1.example.com</domain:hostName>
+              <domain:hostName>ns.littelrempel66.ee</domain:hostName>
             </domain:hostAttr>
           </domain:ns>
+          <domain:contact type="admin">sh7509</domain:contact>
         </domain:add>
       </domain:update>
     </update>
@@ -5422,13 +5383,69 @@ RESPONSE:
     <result code="2302">
       <msg lang="en">Nameserver already exists on this domain</msg>
       <value>
-        <hostAttr>ns1.example.com</hostAttr>
+        <hostAttr>ns.littelrempel66.ee</hostAttr>
+      </value>
+    </result>
+    <result code="2302">
+      <msg lang="en">Contact already exists on this domain</msg>
+      <value>
+        <contact>sh7509</contact>
       </value>
     </result>
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6855899158</svTRID>
+  <svTRID>ccReg-0948227825</svTRID>
+</trID>
+</epp>
+```
+
+REQUEST:
+
+```xml
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.ee</domain:name>
+        <domain:add>
+          <domain:ns>
+            <domain:hostAttr>
+              <domain:hostName>ns.littelrempel66.ee</domain:hostName>
+            </domain:hostAttr>
+          </domain:ns>
+          <domain:contact type="admin">sh7509</domain:contact>
+        </domain:add>
+      </domain:update>
+    </update>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>
+```
+
+RESPONSE:
+
+```xml
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<epp schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd">
+  <response>
+    <result code="2302">
+      <msg lang="en">Nameserver already exists on this domain</msg>
+      <value>
+        <hostAttr>ns.littelrempel66.ee</hostAttr>
+      </value>
+    </result>
+    <result code="2302">
+      <msg lang="en">Contact already exists on this domain</msg>
+      <value>
+        <contact>sh7509</contact>
+      </value>
+    </result>
+  </response>
+<trID>
+  <clTRID>ABC-12345</clTRID>
+  <svTRID>ccReg-2720655033</svTRID>
 </trID>
 </epp>
 ```
@@ -5466,7 +5483,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0069924086</svTRID>
+  <svTRID>ccReg-1890455193</svTRID>
 </trID>
 </epp>
 ```
@@ -5510,7 +5527,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8640564828</svTRID>
+  <svTRID>ccReg-4951401898</svTRID>
 </trID>
 </epp>
 ```
@@ -5551,7 +5568,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-8719086717</svTRID>
+  <svTRID>ccReg-3895958965</svTRID>
 </trID>
 </epp>
 ```
@@ -5591,7 +5608,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-1387277939</svTRID>
+  <svTRID>ccReg-9993454127</svTRID>
 </trID>
 </epp>
 ```
@@ -5631,7 +5648,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7917636800</svTRID>
+  <svTRID>ccReg-3176434680</svTRID>
 </trID>
 </epp>
 ```
@@ -5666,7 +5683,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-7224611323</svTRID>
+  <svTRID>ccReg-5843006176</svTRID>
 </trID>
 </epp>
 ```
@@ -5690,13 +5707,13 @@ REQUEST:
         <secDNS:pubKey>cmlraXN0aGViZXN0</secDNS:pubKey>
       </ext:keyData>
       <ext:authInfo>
-        <domain:pw>335dd76bb33123d06d7452e62f244681</domain:pw>
+        <domain:pw>96d53431854b3508c7c1b3d8d0823710</domain:pw>
       </ext:authInfo>
       <ext:expiry>
         <ext:relative>P1M13D</ext:relative>
       </ext:expiry>
     </ext:keyrelay>
-    <ext:clTRID>1421849833</ext:clTRID>
+    <ext:clTRID>1421854435</ext:clTRID>
   </command>
 </epp>
 ```
@@ -5712,8 +5729,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849833</clTRID>
-  <svTRID>ccReg-3505490569</svTRID>
+  <clTRID>1421854435</clTRID>
+  <svTRID>ccReg-2547923605</svTRID>
 </trID>
 </epp>
 ```
@@ -5735,13 +5752,13 @@ REQUEST:
         <secDNS:pubKey>cmlraXN0aGViZXN0</secDNS:pubKey>
       </ext:keyData>
       <ext:authInfo>
-        <domain:pw>e007241181e77920ef99efb0891b695d</domain:pw>
+        <domain:pw>08c8ec149ab619a4cebc9cb3a956d0ff</domain:pw>
       </ext:authInfo>
       <ext:expiry>
         <ext:relative>Invalid Expiry</ext:relative>
       </ext:expiry>
     </ext:keyrelay>
-    <ext:clTRID>1421849834</ext:clTRID>
+    <ext:clTRID>1421854435</ext:clTRID>
   </command>
 </epp>
 ```
@@ -5757,8 +5774,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849834</clTRID>
-  <svTRID>ccReg-8525486346</svTRID>
+  <clTRID>1421854435</clTRID>
+  <svTRID>ccReg-5993512867</svTRID>
 </trID>
 </epp>
 ```
@@ -5780,13 +5797,13 @@ REQUEST:
         <secDNS:pubKey>cmlraXN0aGViZXN0</secDNS:pubKey>
       </ext:keyData>
       <ext:authInfo>
-        <domain:pw>710d60f90cec377c8a40526f8b82161d</domain:pw>
+        <domain:pw>e8bbc97f85b8da5b1a4995fa3674704b</domain:pw>
       </ext:authInfo>
       <ext:expiry>
         <ext:relative>Invalid Expiry</ext:relative>
       </ext:expiry>
     </ext:keyrelay>
-    <ext:clTRID>1421849834</ext:clTRID>
+    <ext:clTRID>1421854436</ext:clTRID>
   </command>
 </epp>
 ```
@@ -5805,8 +5822,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849834</clTRID>
-  <svTRID>ccReg-8919178767</svTRID>
+  <clTRID>1421854436</clTRID>
+  <svTRID>ccReg-2411992043</svTRID>
 </trID>
 </epp>
 ```
@@ -5828,14 +5845,14 @@ REQUEST:
         <secDNS:pubKey>cmlraXN0aGViZXN0</secDNS:pubKey>
       </ext:keyData>
       <ext:authInfo>
-        <domain:pw>d7a4ed94625893508ec7f3b949dabc6e</domain:pw>
+        <domain:pw>2ca4a9a52e66a30c21f2046d8dd7989d</domain:pw>
       </ext:authInfo>
       <ext:expiry>
         <ext:relative>P1D</ext:relative>
         <ext:absolute>2014-12-23</ext:absolute>
       </ext:expiry>
     </ext:keyrelay>
-    <ext:clTRID>1421849834</ext:clTRID>
+    <ext:clTRID>1421854436</ext:clTRID>
   </command>
 </epp>
 ```
@@ -5851,8 +5868,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849834</clTRID>
-  <svTRID>ccReg-7158812998</svTRID>
+  <clTRID>1421854436</clTRID>
+  <svTRID>ccReg-6592311645</svTRID>
 </trID>
 </epp>
 ```
@@ -5866,7 +5883,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849835</clTRID>
+    <clTRID>1421854437</clTRID>
   </command>
 </epp>
 ```
@@ -5881,8 +5898,8 @@ RESPONSE:
       <msg>Command completed successfully; no messages</msg>
     </result>
 <trID>
-  <clTRID>1421849835</clTRID>
-  <svTRID>ccReg-3454719670</svTRID>
+  <clTRID>1421854437</clTRID>
+  <svTRID>ccReg-5840350645</svTRID>
 </trID>
   </response>
 </epp>
@@ -5897,7 +5914,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849835</clTRID>
+    <clTRID>1421854437</clTRID>
   </command>
 </epp>
 ```
@@ -5912,8 +5929,8 @@ RESPONSE:
       <msg>Command completed successfully; no messages</msg>
     </result>
 <trID>
-  <clTRID>1421849835</clTRID>
-  <svTRID>ccReg-8971860113</svTRID>
+  <clTRID>1421854437</clTRID>
+  <svTRID>ccReg-8633076129</svTRID>
 </trID>
   </response>
 </epp>
@@ -5926,7 +5943,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849835</clTRID>
+    <clTRID>1421854437</clTRID>
   </command>
 </epp>
 ```
@@ -5941,12 +5958,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="1" id="1">
-      <qDate>2015-01-21 14:17:15 UTC</qDate>
+      <qDate>2015-01-21 15:33:57 UTC</qDate>
       <msg>Balance low.</msg>
     </msgQ>
 <trID>
-  <clTRID>1421849835</clTRID>
-  <svTRID>ccReg-9534667603</svTRID>
+  <clTRID>1421854437</clTRID>
+  <svTRID>ccReg-2114336517</svTRID>
 </trID>
   </response>
 </epp>
@@ -5959,7 +5976,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="ack" msgID="1"/>
-    <clTRID>1421849835</clTRID>
+    <clTRID>1421854437</clTRID>
   </command>
 </epp>
 ```
@@ -5978,8 +5995,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849835</clTRID>
-  <svTRID>ccReg-9929870302</svTRID>
+  <clTRID>1421854437</clTRID>
+  <svTRID>ccReg-9469898500</svTRID>
 </trID>
 </epp>
 ```
@@ -5991,7 +6008,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="ack" msgID="1"/>
-    <clTRID>1421849835</clTRID>
+    <clTRID>1421854437</clTRID>
   </command>
 </epp>
 ```
@@ -6007,8 +6024,8 @@ RESPONSE:
     </result>
     <msgQ count="0" id="1"/>
 <trID>
-  <clTRID>1421849835</clTRID>
-  <svTRID>ccReg-5366171531</svTRID>
+  <clTRID>1421854437</clTRID>
+  <svTRID>ccReg-5087975069</svTRID>
 </trID>
   </response>
 </epp>
@@ -6021,7 +6038,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="ack" msgID="1"/>
-    <clTRID>1421849835</clTRID>
+    <clTRID>1421854437</clTRID>
   </command>
 </epp>
 ```
@@ -6040,8 +6057,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849835</clTRID>
-  <svTRID>ccReg-9285009805</svTRID>
+  <clTRID>1421854437</clTRID>
+  <svTRID>ccReg-5269525053</svTRID>
 </trID>
 </epp>
 ```
@@ -6055,7 +6072,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="bla"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6071,8 +6088,8 @@ RESPONSE:
     </result>
   </response>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-0433094460</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-3447356171</svTRID>
 </trID>
 </epp>
 ```
@@ -6086,7 +6103,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6101,12 +6118,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="3" id="3">
-      <qDate>2015-01-21 14:17:16 UTC</qDate>
+      <qDate>2015-01-21 15:33:58 UTC</qDate>
       <msg>Smth else.</msg>
     </msgQ>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-3585279293</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-9858546062</svTRID>
 </trID>
   </response>
 </epp>
@@ -6119,7 +6136,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="ack" msgID="3"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6135,8 +6152,8 @@ RESPONSE:
     </result>
     <msgQ count="2" id="3"/>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-4438065253</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-6982235095</svTRID>
 </trID>
   </response>
 </epp>
@@ -6149,7 +6166,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6164,12 +6181,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="2" id="2">
-      <qDate>2015-01-21 14:17:16 UTC</qDate>
+      <qDate>2015-01-21 15:33:58 UTC</qDate>
       <msg>Something.</msg>
     </msgQ>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-0429862850</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-7461777476</svTRID>
 </trID>
   </response>
 </epp>
@@ -6182,7 +6199,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="ack" msgID="2"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6198,8 +6215,8 @@ RESPONSE:
     </result>
     <msgQ count="1" id="2"/>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-8093386034</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-5104983932</svTRID>
 </trID>
   </response>
 </epp>
@@ -6212,7 +6229,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6227,12 +6244,12 @@ RESPONSE:
       <msg>Command completed successfully; ack to dequeue</msg>
     </result>
     <msgQ count="1" id="1">
-      <qDate>2015-01-21 14:17:16 UTC</qDate>
+      <qDate>2015-01-21 15:33:58 UTC</qDate>
       <msg>Balance low.</msg>
     </msgQ>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-4880386641</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-6914379969</svTRID>
 </trID>
   </response>
 </epp>
@@ -6245,7 +6262,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="ack" msgID="1"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6261,8 +6278,8 @@ RESPONSE:
     </result>
     <msgQ count="0" id="1"/>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-9303709889</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-4310713497</svTRID>
 </trID>
   </response>
 </epp>
@@ -6275,7 +6292,7 @@ REQUEST:
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
   <command>
     <poll op="req"/>
-    <clTRID>1421849836</clTRID>
+    <clTRID>1421854438</clTRID>
   </command>
 </epp>
 ```
@@ -6290,8 +6307,8 @@ RESPONSE:
       <msg>Command completed successfully; no messages</msg>
     </result>
 <trID>
-  <clTRID>1421849836</clTRID>
-  <svTRID>ccReg-3444467396</svTRID>
+  <clTRID>1421854438</clTRID>
+  <svTRID>ccReg-4534174090</svTRID>
 </trID>
   </response>
 </epp>
@@ -6306,7 +6323,7 @@ RESPONSE:
 <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">
   <greeting>
     <svID>EPP server (EIS)</svID>
-    <svDate>2015-01-21T14:17:17Z</svDate>
+    <svDate>2015-01-21T15:33:59Z</svDate>
     <svcMenu>
       <version>1.0</version>
       <lang>en</lang>
@@ -6383,7 +6400,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9256738959</svTRID>
+  <svTRID>ccReg-7809234592</svTRID>
 </trID>
 </epp>
 ```
@@ -6429,7 +6446,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9323746967</svTRID>
+  <svTRID>ccReg-9309197704</svTRID>
 </trID>
 </epp>
 ```
@@ -6462,7 +6479,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-6357688041</svTRID>
+  <svTRID>ccReg-9650794606</svTRID>
 </trID>
 </epp>
 ```
@@ -6509,7 +6526,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2194909590</svTRID>
+  <svTRID>ccReg-6720657569</svTRID>
 </trID>
   </response>
 </epp>
@@ -6557,7 +6574,7 @@ RESPONSE:
     </result>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-0114132692</svTRID>
+  <svTRID>ccReg-1328488104</svTRID>
 </trID>
   </response>
 </epp>
@@ -6587,7 +6604,7 @@ RESPONSE:
   </response>
 <trID>
   <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9911132910</svTRID>
+  <svTRID>ccReg-7314960747</svTRID>
 </trID>
 </epp>
 ```
@@ -6623,66 +6640,3 @@ REQUEST:
 </epp>
 ```
 
-RESPONSE:
-
-```xml
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd">
-  <response>
-    <result code="1000">
-      <msg>Command completed successfully</msg>
-    </result>
-<trID>
-  <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-2989818740</svTRID>
-</trID>
-  </response>
-</epp>
-```
-
-REQUEST:
-
-```xml
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <login>
-      <clID>gitlab</clID>
-      <pw>ghyt9e4fu</pw>
-      <options>
-        <version>1.0</version>
-        <lang>en</lang>
-      </options>
-      <svcs>
-        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
-        <svcExtension>
-          <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
-          <extURI>urn:ee:eis:xml:epp:eis-1.0</extURI>
-        </svcExtension>
-      </svcs>
-    </login>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>
-```
-
-RESPONSE:
-
-```xml
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd">
-  <response>
-    <result code="2002">
-      <msg lang="en">Already logged in. Use &lt;logout&gt; first.</msg>
-    </result>
-  </response>
-<trID>
-  <clTRID>ABC-12345</clTRID>
-  <svTRID>ccReg-9242050358</svTRID>
-</trID>
-</epp>
-```
-
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index fec5867a6..5c7ee92fe 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -1126,7 +1126,7 @@ describe 'EPP Domain', epp: true do
         expect(response[:results][1][:value]).to eq('ns2.example.com')
 
         expect(response[:results][2][:result_code]).to eq('2302')
-        expect(response[:results][2][:msg]).to eq('Contact already exists on this domain!')
+        expect(response[:results][2][:msg]).to eq('Contact already exists on this domain')
         expect(response[:results][2][:value]).to eq('mak21')
 
         expect(response[:results][3][:msg]).to eq('Status already exists on this domain')
@@ -1265,18 +1265,23 @@ describe 'EPP Domain', epp: true do
       end
 
       it 'does not add duplicate objects to domain' do
-        Fabricate(:contact, code: 'mak21')
+        d = Domain.first
+        c = d.admin_contacts.first
+        n = d.nameservers.first
 
         xml = domain_update_xml({
-          add: [
+          add: {
             ns: [
               {
                 hostAttr: [
-                  { hostName: { value: 'ns1.example.com' } }
+                  { hostName: { value: n.hostname } }
                 ]
               }
+            ],
+            _anonymus: [
+              { contact: { value: c.code, attrs: { type: 'admin' } } }
             ]
-          ]
+          }
         })
 
         epp_request(xml, :xml)
@@ -1284,7 +1289,11 @@ describe 'EPP Domain', epp: true do
 
         expect(response[:results][0][:result_code]).to eq('2302')
         expect(response[:results][0][:msg]).to eq('Nameserver already exists on this domain')
-        expect(response[:results][0][:value]).to eq('ns1.example.com')
+        expect(response[:results][0][:value]).to eq(n.hostname)
+
+        expect(response[:results][1][:result_code]).to eq('2302')
+        expect(response[:results][1][:msg]).to eq('Contact already exists on this domain')
+        expect(response[:results][1][:value]).to eq(c.code)
       end
 
       it 'cannot change registrant without legal document' do