diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml
index b5fbfa00d..938d56958 100644
--- a/app/views/contacts/index.html.haml
+++ b/app/views/contacts/index.html.haml
@@ -59,10 +59,7 @@
         = t('.no_contacts')
         %br
         %br
-        = t('.check_out')
-        = link_to t('contacts.spotlight.community_spotlight'), community_spotlight_path
         - if @aspect
-          or
-          = link_to t('.add_to_aspect', :name => @aspect.name), edit_aspect_path(@aspect), :rel => "facebox"
-
-
+          != t('.no_contacts_message_with_aspect',
+              :community_spotlight => link_to(t('.community_spotlight'), community_spotlight_path),
+              :add_to_aspect_link => link_to(t('.add_to_aspect_link', :name => @aspect.name), edit_aspect_path(@aspect), :rel => "facebox"))
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index b43741914..06df525aa 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -252,7 +252,10 @@ en:
       title: "Contacts"
       your_contacts: "Your Contacts"
       no_contacts: "Looks like you need to add some contacts!"
-      check_out: "Check out"
+      no_contacts_message: "Check out %{community_spotlight}"
+      no_contacts_message_with_aspect: "Check out %{community_spotlight} or %{add_to_aspect_link}"
+      add_to_aspect_link: "add contacts to %{name}"
+      community_spotlight: "Community Spotlight"
       my_contacts: "My Contacts"
       all_contacts: "All Contacts"
       only_sharing_with_me: "Only sharing with me"