diff --git a/app/views/profile_editor/edit.rhtml b/app/views/profile_editor/edit.rhtml
index df8d6fa..755fa7e 100644
--- a/app/views/profile_editor/edit.rhtml
+++ b/app/views/profile_editor/edit.rhtml
@@ -4,11 +4,26 @@
 
 <% labelled_form_for :profile_data, @profile, :html => { :multipart => true } do |f| %>
   <%= render :partial => partial_for_class(@profile.class), :locals => { :f => f } %>
-  <h1><%= _('Change your picture') %></h1>
+
+  <h1><%= _('Change picture') %></h1>
   <% f.fields_for :image_builder, @profile.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @profile.image, i) %>
   <% end %>
+
+  <h1><%= _('Privacy options') %></h1>
+  <p>
+    <%= _('This profile is:') %>
+    <div>
+      <%= radio_button 'profile_data', 'public_profile', 'true' %>
+    </div>
+    <div>
+      <%= radio_button 'profile_data', 'public_profile', 'false' %>
+    </div>
+  </p>
+
   <%= select_categories(:profile_data, _('Select the categories of your interest'), 1) %>
+
+
   <% button_bar do %>
     <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}) %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
diff --git a/test/functional/profile_editor_controller_test.rb b/test/functional/profile_editor_controller_test.rb
index 5d8a2d3..dfddb2b 100644
--- a/test/functional/profile_editor_controller_test.rb
+++ b/test/functional/profile_editor_controller_test.rb
@@ -183,8 +183,16 @@ class ProfileEditorControllerTest < Test::Unit::TestCase
   should 'display profile publication option in edit profile screen' do
     profile = Profile['ze']
     get :edit, :profile => 'ze'
-    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'true' }
-    assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'profile_data[public_profile]', :value => false }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'true' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[public_profile]', :value => 'false' }
+  end
+
+  should 'display properly that the profile is non-public' do
+    profile = Profile['ze']
+    profile.update_attributes!(:public_profile => false)
+    get :edit, :profile => 'ze'
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :checked => 'checked', :name => 'profile_data[public_profile]', :value => 'false' }
+    assert_tag :tag => 'input', :attributes => { :type => 'radio', :name => 'profile_data[public_profile]', :value => 'true' }
   end
 
   should 'save profile publication option set to true' do
--
libgit2 0.21.2