diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2342e807..30e7ef85 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -113,7 +113,6 @@ class ProjectsController < ApplicationController
   # Edit @project
   def edit
     if request.post?
-      @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
       if params[:custom_fields]
         @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
         @project.custom_values = @custom_values
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index e29777af..e63c929c 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -35,10 +35,11 @@
 <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
 <% for custom_field in @custom_fields %>
     <label class="floating">
-	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= check_box_tag 'project[custom_field_ids][]', custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
 	<%= custom_field.name %>
 	</label>
 <% end %>
+<%= hidden_field_tag 'project[custom_field_ids][]', '' %>
 </fieldset>
 <% end %>
 <!--[eoform:project]-->
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 61047079..16eb2906 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -71,7 +71,8 @@ class ProjectsControllerTest < Test::Unit::TestCase
   
   def test_edit
     @request.session[:user_id] = 2 # manager
-    post :edit, :id => 1, :project => {:name => 'Test changed name'}
+    post :edit, :id => 1, :project => {:name => 'Test changed name',
+                                       :custom_field_ids => ['']}
     assert_redirected_to 'projects/settings/ecookbook'
     project = Project.find(1)
     assert_equal 'Test changed name', project.name