diff --git a/app/views/account/accept_terms.html.erb b/app/views/account/accept_terms.html.erb
index 7a03f64..dfc4ab2 100644
--- a/app/views/account/accept_terms.html.erb
+++ b/app/views/account/accept_terms.html.erb
@@ -15,7 +15,7 @@
 
   <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
 
-  <% form_tag :action => 'activate_enterprise' do %>
+  <%= form_tag :action => 'activate_enterprise' do %>
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
     <%= hidden_field_tag :answer, params[:answer] %>
 
diff --git a/app/views/account/change_password.html.erb b/app/views/account/change_password.html.erb
index 9993cae..0c4e2cc 100644
--- a/app/views/account/change_password.html.erb
+++ b/app/views/account/change_password.html.erb
@@ -1,6 +1,6 @@
 <h1><%= _('Change password') %></h1>
 
-<% form_tag do %>
+<%= form_tag do %>
 
 <p><label for="password"><%= _('Current password') %></label><br/>
 <%= password_field_tag :current_password %></p>
diff --git a/app/views/account/forgot_password.html.erb b/app/views/account/forgot_password.html.erb
index 2aa98ea..3975daf 100644
--- a/app/views/account/forgot_password.html.erb
+++ b/app/views/account/forgot_password.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= labelled_form_field fields_label, text_field_tag(:value) %>
 
   <div>
diff --git a/app/views/admin_panel/set_portal_community.html.erb b/app/views/admin_panel/set_portal_community.html.erb
index 476f4ea..03dd6f2 100644
--- a/app/views/admin_panel/set_portal_community.html.erb
+++ b/app/views/admin_panel/set_portal_community.html.erb
@@ -1,7 +1,7 @@
 <h1> <%= _('Set Environment Portal') %></h1>
 
 <% if @portal_community.new_record? %>
-  <% form_tag do %>
+  <%= form_tag do %>
     <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
 
     <% button_bar do %>
diff --git a/app/views/admin_panel/set_portal_folders.html.erb b/app/views/admin_panel/set_portal_folders.html.erb
index 2b4692c..a3f0aaa 100644
--- a/app/views/admin_panel/set_portal_folders.html.erb
+++ b/app/views/admin_panel/set_portal_folders.html.erb
@@ -28,7 +28,7 @@
   <%= button :up, _('Remove'), '#', { :id => 'remove' } %>
 </div>
 
-<% form_tag do %>
+<%= form_tag do %>
   <div id='portal-folders'>
     <%= labelled_form_field(_('Portal folders'), select_tag( 'folders[]', options_from_collection_for_select(@selected, :id, :name, nil), {:id => 'selected-folders', :multiple => true, :size => 6 })) %>
   </div>
diff --git a/app/views/box_organizer/add_block.html.erb b/app/views/box_organizer/add_block.html.erb
index 70370cf..f086512 100644
--- a/app/views/box_organizer/add_block.html.erb
+++ b/app/views/box_organizer/add_block.html.erb
@@ -1,5 +1,5 @@
 <div id="add-block-dialog">
-  <% form_tag do %>
+  <%= form_tag do %>
 
     <p><%= _('In what area do you want to put your new block?') %></p>
 
diff --git a/app/views/cms/publish.html.erb b/app/views/cms/publish.html.erb
index d7cfc99..5e6c115 100644
--- a/app/views/cms/publish.html.erb
+++ b/app/views/cms/publish.html.erb
@@ -14,7 +14,7 @@
   </div>
 <% end %>
 
-<% form_tag do%>
+<%= form_tag do%>
   <%= hidden_field_tag :back_to, @back_to %>
   <% @groups.each do |group| %>
     <%= labelled_check_box group.name, "marked_groups[#{group.id}][group_id]", group.id, @marked_groups.include?(group) %><br />
diff --git a/app/views/cms/publish_on_portal_community.html.erb b/app/views/cms/publish_on_portal_community.html.erb
index 54d5cef..3bb375b 100644
--- a/app/views/cms/publish_on_portal_community.html.erb
+++ b/app/views/cms/publish_on_portal_community.html.erb
@@ -1,7 +1,7 @@
 <% if environment.portal_community %>
   <h1><%= _("Publish your article on portal community") %></h1>
 
-  <% form_tag do%>
+  <%= form_tag do%>
     <%= hidden_field_tag :back_to, @back_to %>
     <%= labelled_text_field _('Title') + ': ', :name, @article.name, :style => 'width: 100%' %>
 
diff --git a/app/views/enterprise_registration/select_validator.html.erb b/app/views/enterprise_registration/select_validator.html.erb
index 6603527..bfbb448 100644
--- a/app/views/enterprise_registration/select_validator.html.erb
+++ b/app/views/enterprise_registration/select_validator.html.erb
@@ -4,7 +4,7 @@
 <%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= render :partial => 'hidden_fields' %>
 
   <table>
diff --git a/app/views/enterprise_validation/details.html.erb b/app/views/enterprise_validation/details.html.erb
index 7fe9d27..803fb18 100644
--- a/app/views/enterprise_validation/details.html.erb
+++ b/app/views/enterprise_validation/details.html.erb
@@ -14,7 +14,7 @@
 
 <p><%= _('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %></p>
 
-<% form_tag :action => 'approve', :id => @pending.code do %>
+<%= form_tag :action => 'approve', :id => @pending.code do %>
   <% button_bar do %>
     <%= submit_button('approve', _('Approve')) %>
   <% end %>
@@ -24,7 +24,7 @@
 
 <p><%= _('If this enterprise does not pass the criteria do be considered, use this form.') %></p>
 
-<% form_tag :action => 'reject', :id => @pending.code do %>
+<%= form_tag :action => 'reject', :id => @pending.code do %>
   <%= labelled_form_field(_('Please provide an explanation for the rejection. This explanation will be sent to the requestor (required).'), text_area_tag('reject_explanation'))%>
   <div>
     <% button_bar do %>
diff --git a/app/views/favorite_enterprises/add.html.erb b/app/views/favorite_enterprises/add.html.erb
index 90bd323..6420578 100644
--- a/app/views/favorite_enterprises/add.html.erb
+++ b/app/views/favorite_enterprises/add.html.erb
@@ -4,7 +4,7 @@
 <%= _('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
 
   <%= submit_button(:ok, _("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
diff --git a/app/views/favorite_enterprises/remove.html.erb b/app/views/favorite_enterprises/remove.html.erb
index 3b5fa43..20c9ce1 100644
--- a/app/views/favorite_enterprises/remove.html.erb
+++ b/app/views/favorite_enterprises/remove.html.erb
@@ -8,7 +8,7 @@
 <%= _('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
 
   <%= submit_button(:ok, _("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
diff --git a/app/views/friends/remove.html.erb b/app/views/friends/remove.html.erb
index b5213e7..1139b0b 100644
--- a/app/views/friends/remove.html.erb
+++ b/app/views/friends/remove.html.erb
@@ -14,7 +14,7 @@
 </em>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
 
   <%= submit_button(:ok, _("Yes") % @friend.name) %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 748d226..44eb861 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -54,7 +54,7 @@
 
 <% if environment.enabled?('search_in_home') %>
   <div id='home-search' style='text-align: center'>
-    <% form_tag :controller => 'search', :action => 'index' do %>
+    <%= form_tag :controller => 'search', :action => 'index' do %>
 
       <div id='search-field' style='text-align: center;'>
         <%= text_field_tag('query', '', :size => 50) %>
diff --git a/app/views/invite/select_address_book.html.erb b/app/views/invite/select_address_book.html.erb
index 64b348c..3286718 100644
--- a/app/views/invite/select_address_book.html.erb
+++ b/app/views/invite/select_address_book.html.erb
@@ -6,7 +6,7 @@
 
 <h2><%= _('Step 1 of 2: Select address book') %></h2>
 
-<% form_tag do %>
+<%= form_tag do %>
 
   <%= [
         radio_button_tag(:import_from, "manual", @import_from == "manual", :onclick => 'hide_invite_friend_login_password()') + content_tag('label', _('Manually (empty field)'), :for => "import_from_manual"),
diff --git a/app/views/invite/select_friends.html.erb b/app/views/invite/select_friends.html.erb
index 721a377..2554345 100644
--- a/app/views/invite/select_friends.html.erb
+++ b/app/views/invite/select_friends.html.erb
@@ -15,7 +15,7 @@
 <%= _('Indicate which friends you want to invite.') %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:import_from, @import_from) %>
   <%= hidden_field_tag(:contact_list, @contact_list.id) %>
 
diff --git a/app/views/profile/join.html.erb b/app/views/profile/join.html.erb
index 1ad934d..a836f75 100644
--- a/app/views/profile/join.html.erb
+++ b/app/views/profile/join.html.erb
@@ -4,7 +4,7 @@
 <%= _('Are you sure you want to join %s?') % profile.name %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag('back_to', @back_to) %>
   <%= hidden_field_tag(:confirmation, 1) %>
   <%= submit_button(:ok, _("Yes, I want to join.") % profile.name) %>
diff --git a/app/views/profile/leave.html.erb b/app/views/profile/leave.html.erb
index 45ffc59..a1f3433 100644
--- a/app/views/profile/leave.html.erb
+++ b/app/views/profile/leave.html.erb
@@ -4,7 +4,7 @@
 <%= _('Are you sure you want to leave %s?') % profile.name %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
   <%= hidden_field_tag(:back_to, @back_to) %>
   <%= submit_button(:ok, _("Yes, I want to leave.") % profile.name) %>
diff --git a/app/views/profile_editor/disable.html.erb b/app/views/profile_editor/disable.html.erb
index 575c96c..ac710f2 100644
--- a/app/views/profile_editor/disable.html.erb
+++ b/app/views/profile_editor/disable.html.erb
@@ -4,7 +4,7 @@
 <%= _('Are you sure you want to disable %s?') % @to_disable.name %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
   <%= submit_button(:ok, _("Yes, I want to disable.")) %>
   <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
diff --git a/app/views/profile_editor/enable.html.erb b/app/views/profile_editor/enable.html.erb
index 1852691..2429cd7 100644
--- a/app/views/profile_editor/enable.html.erb
+++ b/app/views/profile_editor/enable.html.erb
@@ -4,7 +4,7 @@
 <%= _('Are you sure you want to enable %s?') % @to_enable.name %>
 </p>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
   <%= submit_button(:ok, _("Yes, I want to enable.")) %>
   <%= button(:cancel, _("No, I don't want."), :action => 'index') %>
diff --git a/app/views/profile_editor/header_footer.html.erb b/app/views/profile_editor/header_footer.html.erb
index 6ee70c7..643ff57 100644
--- a/app/views/profile_editor/header_footer.html.erb
+++ b/app/views/profile_editor/header_footer.html.erb
@@ -2,7 +2,7 @@
 
 <h1><%= _('Editing header and footer') %></h1>
 
-<% form_tag do %>
+<%= form_tag do %>
   <div style='width: 90%; margin: auto;'>
     <% if environment.enabled?('display_header_footer_explanation') %>
       <div class='explanation'>
diff --git a/app/views/profile_members/_manage_roles.html.erb b/app/views/profile_members/_manage_roles.html.erb
index 4d04d89..cc41e79 100644
--- a/app/views/profile_members/_manage_roles.html.erb
+++ b/app/views/profile_members/_manage_roles.html.erb
@@ -1,4 +1,4 @@
-<% form_tag :action => 'save_associations' do %>
+<%= form_tag :action => 'save_associations' do %>
   <% @roles.each do |role|%>
     <%= content_tag('p', content_tag('b', role.name.pluralize+':'), :style => 'margin-top: 30px; margin-bottom: 0px;') %>
     <%= text_field_tag('q_'+role.key, nil, :id => 'search_'+role.key) %>
diff --git a/app/views/region_validators/_search.html.erb b/app/views/region_validators/_search.html.erb
index 649df23..d10ce23 100644
--- a/app/views/region_validators/_search.html.erb
+++ b/app/views/region_validators/_search.html.erb
@@ -3,7 +3,7 @@
     <% for item in @search %>
       <li>
       <%= item.name %>
-      <% form_tag :action => 'add', :id => @region do %>
+      <%= form_tag :action => 'add', :id => @region do %>
         <%= hidden_field_tag :validator_id, item.id %>
         <% button_bar do %>
           <%= submit_button('add', _('Add')) %>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb
index 7572a0e..6f82fe4 100644
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -28,7 +28,7 @@
   </p>
   <em><%= _('No pending tasks for %s') % profile.name %></em>
 <% else %>
-  <% form_tag :action => 'close' do%>
+  <%= form_tag :action => 'close' do%>
     <% button_bar do %>
       <%# FiXME button(:edit, _('View my requests'), :action => 'list_requested') %>
       <%# FIXME button('menu-mail',  _('Send request'), :action => 'new') %>
diff --git a/app/views/templates/_create_template_form.html.erb b/app/views/templates/_create_template_form.html.erb
index 773ff84..49fe4dc 100644
--- a/app/views/templates/_create_template_form.html.erb
+++ b/app/views/templates/_create_template_form.html.erb
@@ -8,7 +8,7 @@
   </div>
 <% end %>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= labelled_text_field(_('Name')+': ', :name)%>
 
   <% button_bar do %>
diff --git a/app/views/themes/add_css.html.erb b/app/views/themes/add_css.html.erb
index 0517856..1f5d28e 100644
--- a/app/views/themes/add_css.html.erb
+++ b/app/views/themes/add_css.html.erb
@@ -1,6 +1,6 @@
 <h2><%= _('Add a CSS file') %></h2>
 
-<% form_tag do %>
+<%= form_tag do %>
   <%= labelled_form_field(_('File name'), text_field_tag('css')) %>
 
   <% button_bar do %>
diff --git a/app/views/trusted_sites/edit.html.erb b/app/views/trusted_sites/edit.html.erb
index 5834a2b..80dabd5 100644
--- a/app/views/trusted_sites/edit.html.erb
+++ b/app/views/trusted_sites/edit.html.erb
@@ -1,6 +1,6 @@
 <h2> <%= _("Editing trusted site") %> </h2>
 
-<% form_tag :action => :update do %>
+<%= form_tag :action => :update do %>
 
   <%= text_field_tag :site, @site %>
   <%= hidden_field_tag :orig_site, @site %>
diff --git a/app/views/trusted_sites/new.html.erb b/app/views/trusted_sites/new.html.erb
index d64c8ab..bc45b3c 100644
--- a/app/views/trusted_sites/new.html.erb
+++ b/app/views/trusted_sites/new.html.erb
@@ -1,6 +1,6 @@
 <h2> <%= _("Add a new trusted site") %> </h2>
 
-<% form_tag :action => :create do %>
+<%= form_tag :action => :create do %>
 
   <%= text_field_tag :site, @site %>
 
--
libgit2 0.21.2