diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 98d3b0b58..5c1a9a401 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -10,11 +10,21 @@ module ApplicationHelper
   end
 
   def ident_for(contact)
-    case contact.ident_type
-    when 'birthday'
-      "#{contact.ident} [#{contact.ident_type}]"
+    if contact.kind_of? Hash
+      ident_country_code = contact[:ident_country_code]
+      ident_type = contact[:ident_type]
+      ident = contact[:ident]
     else
-      "#{contact.ident} [#{contact.ident_country_code} #{contact.ident_type}]"
+      ident_country_code = contact.ident_country_code
+      ident_type = contact.ident_type
+      ident = contact.ident
+    end
+
+    case ident_type
+    when 'birthday'
+      "#{ident} [#{ident_type}]"
+    else
+      "#{ident} [#{ident_country_code} #{ident_type}]"
     end
   end
 
diff --git a/app/views/registrar/contacts/index.haml b/app/views/registrar/contacts/index.haml
index 33927ee89..39fd8dd10 100644
--- a/app/views/registrar/contacts/index.haml
+++ b/app/views/registrar/contacts/index.haml
@@ -16,7 +16,7 @@
           %tr
             %td= link_to(c[:name], registrar_contact_path(id: c[:code]))
             %td= c[:code]
-            %td= c[:ident]
+            %td= ident_for(c)
             %td
               = link_to(t(:edit), edit_registrar_contact_path(c[:code]), class: 'btn btn-primary btn-xs')
               = link_to(t(:delete), delete_registrar_contact_path(c[:code]), class: 'btn btn-default btn-xs')
diff --git a/app/views/registrar/contacts/partials/_general.haml b/app/views/registrar/contacts/partials/_general.haml
index 2524f34e9..3e3894278 100644
--- a/app/views/registrar/contacts/partials/_general.haml
+++ b/app/views/registrar/contacts/partials/_general.haml
@@ -3,21 +3,19 @@
     %h3.panel-title= t(:general)
   .panel-body
     %dl.dl-horizontal
-      %dt= t(:ident)
-      %dd= ident_for(@contact)
+      %dt= t(:contact_code)
+      %dd= @contact.id
+
+      %dt= t(:password)
+      %dd= @contact.password
 
       %br
 
+      %dt= t(:ident)
+      %dd= ident_for(@contact)
+
       %dt= t(:email)
       %dd= @contact.email
 
       %dt= t(:phone)
       %dd= @contact.phone
-
-      %br
-
-      %dt= t(:contact_code)
-      %dd= @contact.id
-
-      %dt= t(:password)
-      %dd= @contact.password