diff --git a/app/views/shared/_profile_search_form.rhtml b/app/views/shared/_profile_search_form.rhtml
index ca8a50a..9823e4e 100644
--- a/app/views/shared/_profile_search_form.rhtml
+++ b/app/views/shared/_profile_search_form.rhtml
@@ -5,8 +5,8 @@
     </span>
     <%= submit_button(:search, _('Search')) %>
     <div>
-      <%= labelled_radio_button __('Profile'), 'where', 'profile', true %>
-      <%= labelled_radio_button environment.name, 'where', 'environment', false %>
+      <%= labelled_radio_button profile.short_name, 'where', 'profile', true, :title => _("Find in %s's content") % profile.short_name %>
+      <%= labelled_radio_button _('General'), 'where', 'environment', false, :title => _("Search all content") %>
     </div>
   </div>
 <% end %>
diff --git a/features/profile_search.feature b/features/profile_search.feature
index d1bddda..924df22 100644
--- a/features/profile_search.feature
+++ b/features/profile_search.feature
@@ -53,7 +53,7 @@ Feature: search inside a profile
   Scenario: search on environment
     Given I go to Joao Silva's profile
     And I fill in "q" with "bees"
-    And I choose "Colivre.net"
+    And I choose "General"
     And I press "Search"
     Then I should be on the search page
     And I should see "bees and butterflies" within "#search-page"
--
libgit2 0.21.2