diff --git a/app/controllers/public/invite_controller.rb b/app/controllers/public/invite_controller.rb
index d65f43d..ff60041 100644
--- a/app/controllers/public/invite_controller.rb
+++ b/app/controllers/public/invite_controller.rb
@@ -8,7 +8,7 @@ class InviteController < PublicController
     @import_from = params[:import_from] || "manual"
     @mail_template = params[:mail_template] || environment.invitation_mail_template(profile)
 
-    labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label] }
+    labels = Profile::SEARCHABLE_FIELDS.except(:nickname).merge(User::SEARCHABLE_FIELDS).map { |name,info| info[:label].downcase }
     last = labels.pop
     label = labels.join(', ')
     @search_friend_fields = "#{label} #{_('or')} #{last}"
@@ -72,7 +72,6 @@ class InviteController < PublicController
       else
         redirect_to :controller => 'profile', :action => 'members'
       end
-      return
     else
       redirect_to :action => 'invite_friends'
       session[:notice] = _('Please enter a valid profile.')
diff --git a/app/views/invite/invite_friends.html.erb b/app/views/invite/invite_friends.html.erb
index adfc91c..0ae4a6b 100644
--- a/app/views/invite/invite_friends.html.erb
+++ b/app/views/invite/invite_friends.html.erb
@@ -4,13 +4,13 @@
   <h1><%= _('Invite your friends to join %s') % profile.name %></h1>
 <% end %>
 
-<% unless profile.person? %>
-  <h2><%= _('Invite other registered users') %></h2>
+<% if profile.community? %>
+  <h2><%= _('Invite registered users') %></h2>
   <p><%= _('You can search for user profiles and invite them to join this community.') %></p>
   <%= form_tag :action => 'invite_registered_friend' do %>
     <% search_action = url_for(:action => 'search_friend') %>
     <%= token_input_field_tag(:q, 'search-friends', search_action,
-                              { :hint_text => _('Type in your friend\'s ') + @search_friend_fields,
+                              { :hint_text => _('Type in your friend\'s %{search_fields}') % {:search_fields => @search_friend_fields},
                                 :focus => false }) %>
 
     <% button_bar do %>
--
libgit2 0.21.2