diff --git a/app/views/for_models/whois.erb b/app/views/for_models/whois.erb
index 2d8db1d59..04abd3094 100644
--- a/app/views/for_models/whois.erb
+++ b/app/views/for_models/whois.erb
@@ -1,4 +1,4 @@
-<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join('\n') %>
+<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
 
 Estonia .ee Top Level Domain WHOIS server
 
@@ -25,18 +25,18 @@ changed: <%= json['registrant_changed'].to_s.tr('T',' ').sub('+', ' +') %>
 <%- if json['admin_contacts'].present? -%>
 Administrative contact:
 <%- for contact in json['admin_contacts'] -%>
-name:       <%= contact['name'] %>
+name:       Not Disclosed - Visit www.internet.ee for webbased WHOIS
 email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
+changed:    Not Disclosed - Visit www.internet.ee for webbased WHOIS
 <%- end -%>
 
 <%- end -%>
 <% if json['tech_contacts'].present? %>
 Technical contact:
 <%- for contact in json['tech_contacts'] -%>
-name:       <%= contact['name'] %>
+name:       Not Disclosed - Visit www.internet.ee for webbased WHOIS
 email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
+changed:    Not Disclosed - Visit www.internet.ee for webbased WHOIS
 <%- end -%>
 
 <%- end -%>
diff --git a/test/models/whois_record_test.rb b/test/models/whois_record_test.rb
index 83822d37e..ea8de006a 100644
--- a/test/models/whois_record_test.rb
+++ b/test/models/whois_record_test.rb
@@ -32,15 +32,22 @@ class WhoisRecordTest < ActiveSupport::TestCase
   end
 
   def test_generated_body_has_justified_disclaimer
-    expected_disclaimer_first_line = begin
-      "Search results may not be used for commercial, advertising, recompilation,"
+    expected_disclaimer = begin
+      'Search results may not be used for commercial, advertising, recompilation,\n' \
+      'repackaging, redistribution, reuse, obscuring or other similar activities.'
     end
-    expected_disclaimer_second_line = begin
-      "repackaging, redistribution, reuse, obscuring or other similar activities"
+    expected_technical_contact = begin
+      'Technical contact:\n' \
+      'name:       Not Disclosed - Visit www.internet.ee for webbased WHOIS\n' \
+      'email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS\n' \
+      'changed:    Not Disclosed - Visit www.internet.ee for webbased WHOIS'
     end
-    @record.populate
 
-    assert_match(expected_disclaimer_first_line, @record.body)
-    assert_match(expected_disclaimer_second_line, @record.body)
+    regexp_contact = Regexp.new(expected_technical_contact, Regexp::MULTILINE)
+    regexp_disclaimer = Regexp.new(expected_disclaimer, Regexp::MULTILINE)
+
+    @record.populate
+    assert_match(regexp_disclaimer,        @record.body)
+    assert_match(regexp_contact,           @record.body)
   end
 end