diff --git a/app/views/profile/_organization.rhtml b/app/views/profile/_organization.rhtml
index 4fd2cf6..9f562a1 100644
--- a/app/views/profile/_organization.rhtml
+++ b/app/views/profile/_organization.rhtml
@@ -1,7 +1,6 @@
 <tr>
   <th colspan='2'><%= _('Basic information')%></th>
 </tr>
-<%= display_field(_('Description:'), profile, :description) if !@action %>
 
 <tr>
   <td class='field-name'><%= _('Members') %></td>
diff --git a/app/views/profile/_person.rhtml b/app/views/profile/_person.rhtml
index cffeeb2..41b72d5 100644
--- a/app/views/profile/_person.rhtml
+++ b/app/views/profile/_person.rhtml
@@ -1,7 +1,6 @@
 <tr>
   <th colspan='2'><%= _('Basic information')%></th>
 </tr>
-<%= display_field(_('About:'), profile, :description) if !@action %>
 <%= display_field(_('Sex:'), profile, :sex) { |gender| { 'male' => _('Male'), 'female' => _('Female') }[gender] } %>
 <%= display_field(_('Date of birth:'), profile, :birth_date) { |date| show_date(date)  }%>
 <%= display_field(_('Location:'), profile, :location, true) %>
diff --git a/app/views/profile/index.rhtml b/app/views/profile/index.rhtml
index 5cc9e8a..b976a04 100644
--- a/app/views/profile/index.rhtml
+++ b/app/views/profile/index.rhtml
@@ -6,6 +6,12 @@
   <%= render :partial => 'private_profile' %>
 <% end %>
 
+<% if !@action %>
+  <div class='public-profile-description'>
+    <%= profile.description %>
+  </div>
+<% end %>
+
 <table class='profile'>
   <%= render :partial => partial_for_class(profile.class) %>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ee297c2..7b7a6e9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3038,6 +3038,10 @@ h1#agenda-title {
   padding: 10px;
 }
 
+.controller-profile .public-profile-description {
+  font-weight: bold;
+}
+
 .controller-profile .private-profile-message,
 .controller-profile .private-profile-description {
   margin: 5px 0px 5px 160px;
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 256a1af..462255b 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -665,4 +665,23 @@ class ProfileControllerTest < Test::Unit::TestCase
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :content => 'One picture', :attributes => { :href => /\/testuser\/gallery/ }
   end
+
+  should 'show description of orgarnization' do
+    login_as(@profile.identifier)
+    ent = fast_create(Enterprise)
+    ent.description = 'Enterprise\'s description'
+    ent.save
+    get :index, :profile => ent.identifier
+    assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Enterprise\'s description/
+  end
+
+  should 'show description of person' do
+    login_as(@profile.identifier)
+    @profile.description = 'Person\'s description'
+    @profile.save
+    get :index, :profile => @profile.identifier
+    assert_tag :tag => 'div', :attributes => { :class => 'public-profile-description' }, :content => /Person\'s description/
+  end
+
+
 end
--
libgit2 0.21.2