diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6878932..45ce611 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -871,6 +871,13 @@ module ApplicationHelper
     form_for(*args, &proc)
   end
 
+  def labelled_form_for(*args, &proc)
+    args << {} unless args.last.is_a?(Hash)
+    options = args.last
+    options.merge!({:builder => TabularFormBuilder})
+    form_for(*args, &proc)
+  end
+
   def back_url_hidden_field_tag
     back_url = params[:back_url] || request.env['HTTP_REFERER']
     back_url = CGI.unescape(back_url.to_s)
diff --git a/app/views/groups/_general.html.erb b/app/views/groups/_general.html.erb
index f13ef32..a9d05b7 100644
--- a/app/views/groups/_general.html.erb
+++ b/app/views/groups/_general.html.erb
@@ -1,4 +1,4 @@
-<% labelled_tabular_form_for :group, @group, :url => group_path(@group), :html => {:method => :put} do |f| %>
+<% labelled_form_for @group do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index 48b9ab4..418563a 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -14,7 +14,7 @@
   <tbody>
 <% @groups.each do |group| %>
   <tr class="<%= cycle 'odd', 'even' %>">
-    <td><%= link_to h(group), :action => 'edit', :id => group %></td>
+    <td><%= link_to h(group), edit_group_path(group) %></td>
     <td align="center"><%= group.users.size %></td>
     <td class="buttons"><%= link_to l(:button_delete), group, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %></td>
   </tr>
diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb
index c200f5b..a4426f2 100644
--- a/app/views/groups/new.html.erb
+++ b/app/views/groups/new.html.erb
@@ -1,6 +1,6 @@
 <h2><%= link_to l(:label_group_plural), groups_path %> &#187; <%= l(:label_group_new) %></h2>
 
-<% form_for(@group, :builder => TabularFormBuilder, :lang => current_language) do |f| %>
+<% labelled_form_for @group do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <p>
   <%= f.submit l(:button_create) %>