diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 751e1d998..9646bd5c9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -23,8 +23,13 @@ module ApplicationHelper
     case ident_type
     when 'birthday'
       "#{ident} [#{ident_type}]"
-    else
-      "#{ident} [#{ident_country_code} #{ident_type}]"
+      else
+        if ident
+          "#{ident} [#{ident_country_code} #{ident_type}]"
+        else
+          "[No access]"
+        end
+
     end
   end
 
diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index 24b37a13f..18019208a 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -77,12 +77,6 @@ xml.epp_head do
                    type: @contact.ident_type, cc: @contact.ident_country_code)
         end
       end
-    else
-      xml.tag!('extension') do
-        xml.tag!('eis:extdata', 'xmlns:eis' => 'https://epp.tld.ee/schema/eis-1.0.xsd') do
-          xml.tag!('eis:ident', 'No access')
-        end
-      end
     end
 
     render('epp/shared/trID', builder: xml)