diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 88a7f1039..06d17b8c8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -20,7 +20,7 @@ module ApplicationHelper
 
   def creator_link(model)
     return 'not present' if model.blank?
-    return model if model.is_a? String
+    return model.creator if model.creator.is_a? String
 
     # can be api user or some other user
     link_to(model.creator, ['admin', model.creator])
@@ -28,9 +28,9 @@ module ApplicationHelper
 
   def updator_link(model)
     return 'not present' if model.blank?
-    return model if model.is_a? String
+    return model.updator if model.updator.is_a? String
 
     # can be api user or some other user
-    link_to(model.creator, ['admin', model.updator])
+    link_to(model.updator, ['admin', model.updator])
   end
 end
diff --git a/spec/features/admin/contact_spec.rb b/spec/features/admin/contact_spec.rb
new file mode 100644
index 000000000..a0b36e181
--- /dev/null
+++ b/spec/features/admin/contact_spec.rb
@@ -0,0 +1,25 @@
+require 'rails_helper'
+
+feature 'Admin contact', type: :feature do
+  background { create_settings }
+
+  before :all do
+    @user = Fabricate(:admin_user, username: 'user1', identity_code: '37810013087')
+    @contact = Fabricate(:contact, name: 'Mr John')
+  end
+
+  it 'should show index of contacts' do
+    sign_in @user
+    visit admin_contacts_url
+
+    page.should have_content('Mr John')
+  end
+
+  it 'should show correct contact creator' do
+    sign_in @user
+    visit admin_contacts_url
+
+    click_link('Mr John')
+    page.should have_content('by autotest')
+  end
+end