diff --git a/app/controllers/admin/environment_role_manager_controller.rb b/app/controllers/admin/environment_role_manager_controller.rb
index 6de4887..fef08a8 100644
--- a/app/controllers/admin/environment_role_manager_controller.rb
+++ b/app/controllers/admin/environment_role_manager_controller.rb
@@ -1,6 +1,6 @@
 class EnvironmentRoleManagerController < AdminController
   protect 'manage_environment_roles', :environment
-  
+
   def index
     @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments )
   end
@@ -8,7 +8,7 @@ class EnvironmentRoleManagerController < AdminController
   def change_roles
     @admin = Person.find(params[:id])
     @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
-  end  
+  end
 
   def update_roles
     @roles = params[:roles] ? Role.find(params[:roles]) : []
@@ -20,7 +20,7 @@ class EnvironmentRoleManagerController < AdminController
     end
     redirect_to :action => :index
   end
-  
+
   def change_role
     @roles = Role.find(:all).select{ |r| r.has_kind?(:environment) }
     @admin = Person.find(params[:id])
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 469a9ac..9524548 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -805,8 +805,7 @@ module ApplicationHelper
     fields_for(name, object, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
 
-  def labelled_form_for(name, object = nil, options = {}, &proc)
-    # FIXME remove the =object= argument and adapt the calling code
+  def labelled_form_for(name, options = {}, &proc)
     form_for(name, { :builder => NoosferoFormBuilder }.merge(options), &proc)
   end
 
diff --git a/app/views/account/_login_form.html.erb b/app/views/account/_login_form.html.erb
index f58f2fd..a145e92 100644
--- a/app/views/account/_login_form.html.erb
+++ b/app/views/account/_login_form.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for :user, @user,
+<%= labelled_form_for :user,
    :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }  do |f| %>
 
 <%= f.text_field :login,
diff --git a/app/views/account/_signup_form.html.erb b/app/views/account/_signup_form.html.erb
index 58d51dc..2b6af52 100644
--- a/app/views/account/_signup_form.html.erb
+++ b/app/views/account/_signup_form.html.erb
@@ -11,7 +11,7 @@
 
 <%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
 
-<%= labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %>
+<%= labelled_form_for :user, :html => { :multipart => true, :id => 'signup-form', :honeypot => true } do |f| %>
 
 <input type="hidden" id="signup_time_key" name="signup_time_key" />
 <script type="text/javascript">
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index dbff603..5126c66 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -7,7 +7,7 @@
 
 <%= @message %>
 
-<%= labelled_form_for :user, @user, :url => login_url do |f| %>
+<%= labelled_form_for :user, :url => login_url do |f| %>
 
      <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
 
diff --git a/app/views/account/login_block.html.erb b/app/views/account/login_block.html.erb
index fc0ea33..aae8c6b 100644
--- a/app/views/account/login_block.html.erb
+++ b/app/views/account/login_block.html.erb
@@ -8,8 +8,8 @@
 <%
   @user ||= User.new
 %>
-    
-    <%= labelled_form_for :user, @user, :url => login_url do |f| %>
+
+    <%= labelled_form_for :user, :url => login_url do |f| %>
 
       <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
 
diff --git a/app/views/admin_panel/message_for_disabled_enterprise.html.erb b/app/views/admin_panel/message_for_disabled_enterprise.html.erb
index 85e7069..ebe1503 100644
--- a/app/views/admin_panel/message_for_disabled_enterprise.html.erb
+++ b/app/views/admin_panel/message_for_disabled_enterprise.html.erb
@@ -2,7 +2,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<%= labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
+<%= labelled_form_for :environment, :url => {:action => 'site_info'} do |f| %>
 
   <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
 
diff --git a/app/views/admin_panel/set_portal_news_amount.html.erb b/app/views/admin_panel/set_portal_news_amount.html.erb
index a129788..a6c5957 100644
--- a/app/views/admin_panel/set_portal_news_amount.html.erb
+++ b/app/views/admin_panel/set_portal_news_amount.html.erb
@@ -1,6 +1,6 @@
 <h1><%= _('News amount by folder') %></h1>
 
-<%= labelled_form_for :environment, @environment do |f| %>
+<%= labelled_form_for :environment do |f| %>
 
   <%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
 
diff --git a/app/views/admin_panel/site_info.html.erb b/app/views/admin_panel/site_info.html.erb
index d1a411e..e2325bb 100644
--- a/app/views/admin_panel/site_info.html.erb
+++ b/app/views/admin_panel/site_info.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<%= labelled_form_for :environment, @environment do |f| %>
+<%= labelled_form_for :environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index b0fac34..3208641 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for 'category' %>
 
-<%= labelled_form_for 'category', @category, :html => { :multipart => true} do |f| %>
+<%= labelled_form_for 'category', :html => { :multipart => true} do |f| %>
 
   <%= required_fields_message %>
 
diff --git a/app/views/cms/destroy.html.erb b/app/views/cms/destroy.html.erb
index dd0a662..953f5c7 100644
--- a/app/views/cms/destroy.html.erb
+++ b/app/views/cms/destroy.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'article' %>
 
-<%= labelled_form_for 'article', @article, :url => { :action => 'destroy' }, :method => 'post' do |f| %>
+<%= labelled_form_for 'article', :url => { :action => 'destroy' }, :method => 'post' do |f| %>
 
   <strong>
     <% if @article.folder? %>
diff --git a/app/views/cms/edit.html.erb b/app/views/cms/edit.html.erb
index 063f455..c38af1c 100644
--- a/app/views/cms/edit.html.erb
+++ b/app/views/cms/edit.html.erb
@@ -1,7 +1,7 @@
 <%= error_messages_for 'article' %>
 
 <div class='<%= (environment.enabled?('media_panel') ? 'with_media_panel' : 'no_media_panel') %>'>
-<%= labelled_form_for 'article', @article, :html => { :multipart => true, :class => @type } do |f| %>
+<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
 
   <%= hidden_field_tag("type", @type) if @type %>
 
diff --git a/app/views/cms/suggest_an_article.html.erb b/app/views/cms/suggest_an_article.html.erb
index bda3132..17da89c 100644
--- a/app/views/cms/suggest_an_article.html.erb
+++ b/app/views/cms/suggest_an_article.html.erb
@@ -4,7 +4,7 @@
 
 <%= render :file => 'shared/tiny_mce' %>
 
-<%= labelled_form_for 'task', @task do |f| %>
+<%= labelled_form_for 'task' do |f| %>
 
   <%= required labelled_form_field(_('Title'), text_field(:task, 'article_name', :size => 50)) %>
 
diff --git a/app/views/contact/new.html.erb b/app/views/contact/new.html.erb
index 027ddb2..d17b468 100644
--- a/app/views/contact/new.html.erb
+++ b/app/views/contact/new.html.erb
@@ -8,7 +8,7 @@
 
 <%= error_messages_for 'contact' %>
 
-<%= labelled_form_for :contact, @contact do |f| %>
+<%= labelled_form_for :contact do |f| %>
   <%= hidden_field_tag(:confirm, 'false') %>
 
   <%= required_fields_message %>
diff --git a/app/views/enterprise_registration/basic_information.html.erb b/app/views/enterprise_registration/basic_information.html.erb
index 13d7f85..67db9e7 100644
--- a/app/views/enterprise_registration/basic_information.html.erb
+++ b/app/views/enterprise_registration/basic_information.html.erb
@@ -18,7 +18,7 @@
 
   <%= required_fields_message %>
 
-  <%= labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+  <%= labelled_form_for :create_enterprise do |f| %>
     <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
     <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
     <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
diff --git a/app/views/enterprise_validation/edit_validation_info.html.erb b/app/views/enterprise_validation/edit_validation_info.html.erb
index b1214bf..63fcc9d 100644
--- a/app/views/enterprise_validation/edit_validation_info.html.erb
+++ b/app/views/enterprise_validation/edit_validation_info.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :info %>
 
-<%= labelled_form_for :info, @info do |f| %>
+<%= labelled_form_for :info do |f| %>
   <%= f.text_area(:validation_methodology, :cols => 50, :rows => 10) %>
   <%= f.text_area(:restrictions, :cols => 50, :rows => 7) %>
   <% button_bar do %>
diff --git a/app/views/environment_role_manager/change_role.html.erb b/app/views/environment_role_manager/change_role.html.erb
index 34a883e..a6c78c3 100644
--- a/app/views/environment_role_manager/change_role.html.erb
+++ b/app/views/environment_role_manager/change_role.html.erb
@@ -1,7 +1,6 @@
 <%= _('Changing role of %s') % @admin.name %>
 
-<%= labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
-  
+<%= labelled_form_for :admin, :url => {:action => 'update_roles'} do |f| %>
   <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
     <%= labelled_form_field(r.name, (check_box_tag "roles[]", r.id, @admin.role_assignments.map{|ra|ra.role}.include?(r))) %>
diff --git a/app/views/environment_role_manager/make_admin.html.erb b/app/views/environment_role_manager/make_admin.html.erb
index 4c8c9a8..c76b2cb 100644
--- a/app/views/environment_role_manager/make_admin.html.erb
+++ b/app/views/environment_role_manager/make_admin.html.erb
@@ -1,6 +1,6 @@
 <h2> <% _('Make new admin') %> </h2>
 
-<%= labelled_form_for :person, @person, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :person, :url => {:action => 'update_roles'} do |f| %>
   <%= _('Admin') %> <br>
   <% @people.each do |p| %>
     <%= labelled_form_field(p.name, (radio_button_tag "person", p.id)) %>
diff --git a/app/views/features/_manage_community_fields.html.erb b/app/views/features/_manage_community_fields.html.erb
index 10d0427..9cb0ebe 100644
--- a/app/views/features/_manage_community_fields.html.erb
+++ b/app/views/features/_manage_community_fields.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
+<%= labelled_form_for(:environment, :url => {:action => 'manage_community_fields'}) do |f| %>
 
 <table id='community_fields_conf'>
   <tr>
diff --git a/app/views/features/_manage_enterprise_fields.html.erb b/app/views/features/_manage_enterprise_fields.html.erb
index c939398..a8840bb 100644
--- a/app/views/features/_manage_enterprise_fields.html.erb
+++ b/app/views/features/_manage_enterprise_fields.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
+<%= labelled_form_for(:environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 
 <table id='enterprise_fields_conf'>
   <tr>
diff --git a/app/views/features/_manage_person_fields.html.erb b/app/views/features/_manage_person_fields.html.erb
index 5895775..1d6eddf 100644
--- a/app/views/features/_manage_person_fields.html.erb
+++ b/app/views/features/_manage_person_fields.html.erb
@@ -1,4 +1,4 @@
-<%= labelled_form_for(:environment, @environment, :url => {:action => 'manage_person_fields'}) do |f| %>
+<%= labelled_form_for(:environment, :url => {:action => 'manage_person_fields'}) do |f| %>
 
 <table id='person_fields_conf'>
   <tr>
diff --git a/app/views/features/index.html.erb b/app/views/features/index.html.erb
index 2a5be94..72efdae 100644
--- a/app/views/features/index.html.erb
+++ b/app/views/features/index.html.erb
@@ -8,7 +8,7 @@
 Check all the features you want to enable for your environment, uncheck all the ones you don\'t want, and use the <em>"Save changes" button</em> to confirm your changes.') %>
 </p>
 
-<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, :url => {:action => 'update'}) do |f| %>
 
 <table>
   <tr>
diff --git a/app/views/memberships/new_community.html.erb b/app/views/memberships/new_community.html.erb
index a7f8f66..21017c0 100644
--- a/app/views/memberships/new_community.html.erb
+++ b/app/views/memberships/new_community.html.erb
@@ -10,7 +10,7 @@
 
 <div>
 
-<%= labelled_form_for :community, @community, :html => { :multipart => true } do |f| %>
+<%= labelled_form_for :community, :html => { :multipart => true } do |f| %>
 
   <%= required_fields_message %>
 
diff --git a/app/views/plugins/index.html.erb b/app/views/plugins/index.html.erb
index 6e37ab9..1ce2a50 100644
--- a/app/views/plugins/index.html.erb
+++ b/app/views/plugins/index.html.erb
@@ -4,7 +4,7 @@
 <%= _('Select which plugins you want to enable in your environment') %>
 </p>
 
-<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, :url => {:action => 'update'}) do |f| %>
 
   <table>
     <% @active_plugins.sort_by(&:plugin_name).each do |plugin|   %>
diff --git a/app/views/profile_editor/edit.html.erb b/app/views/profile_editor/edit.html.erb
index ccdfaf9..c0fdc05 100644
--- a/app/views/profile_editor/edit.html.erb
+++ b/app/views/profile_editor/edit.html.erb
@@ -1,8 +1,8 @@
 <h1><%= _('Profile settings for %s') % profile.name %></h1>
 
-<%= error_messages_for :profile %>
+<%= error_messages_for :profile_data %>
 
-<%= labelled_form_for :profile_data, @profile, :html => { :id => 'profile-data', :multipart => true } do |f| %>
+<%= labelled_form_for :profile_data, :html => { :id => 'profile-data', :multipart => true } do |f| %>
 
   <% if user.has_permission?('manage_environment_templates', profile.environment) %>
     <div id="profile-is-template">
diff --git a/app/views/profile_members/change_role.html.erb b/app/views/profile_members/change_role.html.erb
index 205ddaa..71a8933 100644
--- a/app/views/profile_members/change_role.html.erb
+++ b/app/views/profile_members/change_role.html.erb
@@ -1,6 +1,6 @@
 <h3> <%= _('Changing role of %s') % @member.name %> </h3>
 
-<%= labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
+<%= labelled_form_for :member, :url => {:action => 'update_roles'} do |f| %>
   
   <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
diff --git a/app/views/role/_form.html.erb b/app/views/role/_form.html.erb
index dadbe64..1151c03 100644
--- a/app/views/role/_form.html.erb
+++ b/app/views/role/_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for :role %>
 
-<%= labelled_form_for :role, role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
+<%= labelled_form_for :role, :url => (mode == :edit) ? {:action => 'update', :id => role} : {:action => 'create'} do |f| %>
 
   <%= required_fields_message %>
 
diff --git a/app/views/tasks/new.html.erb b/app/views/tasks/new.html.erb
index f2f1a80..c540fc6 100644
--- a/app/views/tasks/new.html.erb
+++ b/app/views/tasks/new.html.erb
@@ -1,7 +1,7 @@
 <h1><%= @ticket.target ? _('New request for %s') % @ticket.target.name : _('New request') %></h1>
 
 <%# FIXME: put style in css %>
-<%= labelled_form_for :ticket, @ticket do |f| %>
+<%= labelled_form_for :ticket do |f| %>
   <% if @ticket.target %>
     <%= f.hidden_field :target_id  %>
   <% else %>
diff --git a/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb b/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
index feb522d..e746aa3 100644
--- a/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
+++ b/plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
@@ -1,6 +1,6 @@
 <%= error_messages_for :contract %>
 
-<%= labelled_form_for :contract, @contract, :html => {:id => 'bsc-plugin-sales-form'} do |f| %>
+<%= labelled_form_for :contract, :html => {:id => 'bsc-plugin-sales-form'} do |f| %>
   <%= hidden_field_tag :contract_id, @contract.id %>
   <%= required f.text_field(:client_name) %>
   <%= labelled_form_field(_('Client type'), f.select(:client_type, BscPlugin::Contract::ClientType.types.map{|type| [BscPlugin::Contract::ClientType.names[type], type]}))%>
diff --git a/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb b/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
index efebdb6..31ba9b0 100644
--- a/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
+++ b/plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
@@ -4,7 +4,7 @@
 
 <%= required_fields_message %>
 
-<%= labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
+<%= labelled_form_for(:create_enterprise) do |f| %>
 
   <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
diff --git a/plugins/ldap/views/ldap_plugin_admin/index.html.erb b/plugins/ldap/views/ldap_plugin_admin/index.html.erb
index 243c4f7..c467384 100644
--- a/plugins/ldap/views/ldap_plugin_admin/index.html.erb
+++ b/plugins/ldap/views/ldap_plugin_admin/index.html.erb
@@ -1,6 +1,6 @@
 <h1><%= _("Ldap Management") %> </h1>
 
-<%= labelled_form_for(:environment, @environment, :url => {:action => 'update'}) do |f| %>
+<%= labelled_form_for(:environment, :url => {:action => 'update'}) do |f| %>
 
 <table>
   <tr>
--
libgit2 0.21.2