diff --git a/app/controllers/my_profile/profile_editor_controller.rb b/app/controllers/my_profile/profile_editor_controller.rb
index 3ee21a3..6726aae 100644
--- a/app/controllers/my_profile/profile_editor_controller.rb
+++ b/app/controllers/my_profile/profile_editor_controller.rb
@@ -14,7 +14,10 @@ class ProfileEditorController < MyProfileController
     @profile_data = profile
     @possible_domains = profile.possible_domains
     if request.post?
-      params[:profile_data][:fields_privacy] ||= {} if profile.person? && params[:profile_data].is_a?(Hash)
+      if profile.person? && params[:profile_data].is_a?(Hash)
+        params[:profile_data][:fields_privacy] ||= {}
+        params[:profile_data][:custom_fields] ||= {}
+      end
       Profile.transaction do
       Image.transaction do
         if @profile_data.update_attributes(params[:profile_data])
diff --git a/app/views/profile_editor/_person_form.html.erb b/app/views/profile_editor/_person_form.html.erb
index 1ffd150..507b7c4 100644
--- a/app/views/profile_editor/_person_form.html.erb
+++ b/app/views/profile_editor/_person_form.html.erb
@@ -67,21 +67,21 @@
 
 <br />
 
-<h2><%= _('Custom fields') %></h2>
-
 <div id="custom-fields-container">
 
+  <h2><%= _('Custom fields') %></h2>
+
   <% if @person.is_template? %>
 
   <%= javascript_include_tag "manage-custom-fields.js" %>
 
-  <table border="0">
+  <table border="0" style="display: none;">
     <tr>
-      <th style="border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;"><%= _('Field name') %></th>
-      <th style="border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;"><%= _('Active') %></th>
-      <th style="border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;"><%= _('Required') %></th>
-      <th style="border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;"><%= _('Display on signup?') %></th>
-      <th style="border-top: 1px solid #c0c0c0; border-bottom: 1px solid #c0c0c0;">&nbsp;</th>
+      <th><%= _('Field name') %></th>
+      <th><%= _('Active') %></th>
+      <th><%= _('Required') %></th>
+      <th><%= _('Display on signup?') %></th>
+      <th>&nbsp;</th>
     </tr>
 
     <% @person.custom_fields.each { |key,value| %>
@@ -106,6 +106,12 @@
 
   </table>
 
+  <% if @person.custom_fields.length > 0 %>
+    <script>
+      jQuery('#custom-fields-container table').css('display', 'table');
+    </script>
+  <% end %>
+
   <span>
     <%= link_to_function(_('Add field'), "add_new_field('person');", :class => 'button icon-add with-text') %>
   </span>
diff --git a/public/javascripts/manage-custom-fields.js b/public/javascripts/manage-custom-fields.js
index eb68371..24e619a 100644
--- a/public/javascripts/manage-custom-fields.js
+++ b/public/javascripts/manage-custom-fields.js
@@ -36,8 +36,9 @@ function signup_action(name_active, name_required, name_signup) {
 
 function remove_custom_field(element) {
   jQuery(element).parent().parent().remove();
-  //field = jQuery(element).parent().parent();
-  //console.log( field );
+  if ( (jQuery('#custom-fields-container tr').length) == 1 ) {
+    jQuery('#custom-fields-container table').hide();
+  }
   return false;
 }
 
@@ -45,13 +46,15 @@ function add_new_field() {
   var next_custom_field_id;
   var re = /\d+/g;
 
-  if ( (jQuery('#custom-fields-container tr').length - 1) == 0 ) {
+  if ( (jQuery('#custom-fields-container tr').length) == 1 ) {
     next_custom_field_id = 1;
   }
   else {
     next_custom_field_id = parseInt(re.exec( jQuery('#custom-fields-container input').last().attr('id') )[0]) + 1;
   }
 
+  jQuery('#custom-fields-container table').show();
+
   new_custom_field = '' +
                     '<tr>' +
                       '<td>' +
@@ -72,7 +75,6 @@ function add_new_field() {
                     '</tr>'
 
   jQuery('#custom-fields-container tbody').append(new_custom_field);
-
 }
 
 /**
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 34d7d74..6f056c0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6609,6 +6609,16 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   color: #c00;
 }
 
+#custom-fields-container table {
+  margin-bottom: 5px;
+  border-bottom: 1px solid #c0c0c0;
+}
+
+#custom-fields-container th {
+  border-top: 1px solid #c0c0c0;
+  border-bottom: 1px solid #c0c0c0;
+}
+
 #profile_change_picture {
   clear: both;
   margin-top: 20px;
--
libgit2 0.21.2