diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index 1945e7def..4874080e8 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -14,7 +14,11 @@ xml.epp_head do
         end
 
         xml.tag!('contact:postalInfo', type: 'int') do
-          xml.tag!('contact:name', @contact.name)
+          if can? :view_full_info, @contact, @password
+            xml.tag!('contact:name', @contact.name)
+          else
+            xml.tag!('contact:name', 'No access')
+          end
           if can? :view_full_info, @contact, @password
             xml.tag!('contact:org', @contact.org_name) if @contact.org_name.present?
 
diff --git a/app/views/registrar/domains/partials/_contacts.haml b/app/views/registrar/domains/partials/_contacts.haml
index 48d1ac21f..e6ef9aa8f 100644
--- a/app/views/registrar/domains/partials/_contacts.haml
+++ b/app/views/registrar/domains/partials/_contacts.haml
@@ -13,5 +13,5 @@
         - registrant = Contact.find_by_code(x.text)
           %tr
             %td= x['type']
-            %td= registrant.name
+            %td= registrant.registrar == current_registrar_user.registrar ? registrant.name : 'N/A'
             %td= x.text
diff --git a/app/views/registrar/domains/partials/_general.html.erb b/app/views/registrar/domains/partials/_general.html.erb
index 3fb3a5df8..ff064857c 100644
--- a/app/views/registrar/domains/partials/_general.html.erb
+++ b/app/views/registrar/domains/partials/_general.html.erb
@@ -23,7 +23,7 @@
 
             <% registrant = Contact.find_by_code(@data.css('registrant').text) %>
             <dt><%= t('.registrant') %></dt>
-            <dd><%= "#{registrant.name} (#{@data.css('registrant').text})" %></dd>
+            <dd><%= registrant.registrar == current_registrar_user.registrar ? "#{registrant.name} (#{@data.css('registrant').text})" : @data.css('registrant').text %></dd>
 
             <dt><%= t('.registered') %></dt>
             <dd><%= @data.css('crDate').text %></dd>
diff --git a/test/integration/epp/contact/info/base_test.rb b/test/integration/epp/contact/info/base_test.rb
index 80dad97e8..4e4a9190e 100644
--- a/test/integration/epp/contact/info/base_test.rb
+++ b/test/integration/epp/contact/info/base_test.rb
@@ -44,7 +44,7 @@ class EppContactInfoBaseTest < EppTestCase
                                                                     contact: xml_schema).text
   end
 
-  def test_hides_password_when_current_registrar_is_not_sponsoring
+  def test_hides_password_and_name_when_current_registrar_is_not_sponsoring
     non_sponsoring_registrar = registrars(:goodnames)
     @contact.update!(registrar: non_sponsoring_registrar)
 
@@ -70,6 +70,7 @@ class EppContactInfoBaseTest < EppTestCase
     assert_epp_response :completed_successfully
     response_xml = Nokogiri::XML(response.body)
     assert_nil response_xml.at_xpath('//contact:authInfo', contact: xml_schema)
+    assert_equal 'No access', response_xml.at_xpath('//contact:name', contact: xml_schema).text
   end
 
   private