diff --git a/app/views/epp/domains/info.xml.builder b/app/views/epp/domains/info.xml.builder
index 26c91ecfd..9c01f69f1 100644
--- a/app/views/epp/domains/info.xml.builder
+++ b/app/views/epp/domains/info.xml.builder
@@ -28,7 +28,7 @@ xml.epp_head do
 
         xml.tag!('domain:clID', @domain.owner_contact_code)
 
-        xml.tag!('domain:crID', @domain.registrar_name)
+        xml.tag!('domain:crID', @domain.registrar_name) if @domain.registrar #TODO Registrar has to be specified
 
         xml.tag!('domain:crDate', @domain.created_at)