diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 346f7d52..382afdc1 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -2,7 +2,7 @@
 <div class="box login">
 <h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
 
-<%= start_form_tag({:action=> "login"}, :class => "tabular") %>
+<% form_tag ({:action=> "login"}, :class => "tabular") do %>
 <p><label for="login"><%=l(:field_login)%>:</label>
 <%= text_field_tag 'login', nil, :size => 25 %></p>
 
@@ -10,7 +10,7 @@
 <%= password_field_tag 'password', nil, :size => 25 %></p>
 
 <p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
-<%= end_form_tag %>
+<% end %>
 
 <br><% if Setting.self_registration? %><%= link_to l(:label_register), :action => 'register' %> |<% end %>
 <%= link_to l(:label_password_lost), :action => 'lost_password' %></p>
diff --git a/app/views/account/lost_password.rhtml b/app/views/account/lost_password.rhtml
index 3f32e715..ebc64e32 100644
--- a/app/views/account/lost_password.rhtml
+++ b/app/views/account/lost_password.rhtml
@@ -2,13 +2,13 @@
 <div class="box login">
 <h2><%=l(:label_password_lost)%></h2>
 
-<%= start_form_tag({:action=> "lost_password"}, :class => "tabular") %>
+<% form_tag({:action=> "lost_password"}, :class => "tabular") do %>
 
 <p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
 <%= text_field_tag 'mail', nil, :size => 40 %></p>
 
 <p><center><%= submit_tag l(:button_submit) %></center></p>
 
-<%= end_form_tag %>
+<% end %>
 </div>
 </center>
\ No newline at end of file
diff --git a/app/views/account/password_recovery.rhtml b/app/views/account/password_recovery.rhtml
index 39a8071a..2aa58104 100644
--- a/app/views/account/password_recovery.rhtml
+++ b/app/views/account/password_recovery.rhtml
@@ -6,7 +6,7 @@
 
 <%= error_messages_for 'user' %>
 
-  <%= start_form_tag({:token => @token.value}, :class => "tabular") %>
+  <% form_tag({:token => @token.value}, :class => "tabular") do %>
 
   <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
   <%= password_field_tag 'new_password', nil, :size => 25 %></p>
@@ -15,7 +15,7 @@
   <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
 
   <p><center><%= submit_tag l(:button_save) %></center></p>
-  <%= end_form_tag %>
+  <% end %>
   
 </div>
 </center>
\ No newline at end of file
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index 3101bd5d..ac16c3b4 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_register)%></h2>
 
-<%= start_form_tag({:action => 'register'}, :class => "tabular") %>
+<% form_tag({:action => 'register'}, :class => "tabular") do %>
 <%= error_messages_for 'user' %>
 
 <div class="box">
@@ -36,7 +36,7 @@
 </div>
 
 <%= submit_tag l(:button_submit) %>
-<%= end_form_tag %>
+<% end %>
 
 <% content_for :header_tags do %>
 <%= javascript_include_tag 'calendar/calendar' %>
diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index 54e2daf3..dd87f784 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:field_mail_notification)%></h2>
 
-<%= start_form_tag ({}, :id => 'mail_options_form')%>
+<% form_tag ({:action => 'mail_options'}, :id => 'mail_options_form') do %>
 
 <div class="box">
 <p><%=l(:text_select_mail_notifications)%></p>
@@ -21,4 +21,4 @@
 </div>
 
 <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/auth_sources/edit.rhtml b/app/views/auth_sources/edit.rhtml
index 149463e7..165fd4f3 100644
--- a/app/views/auth_sources/edit.rhtml
+++ b/app/views/auth_sources/edit.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:label_auth_source)%> (<%= @auth_source.auth_method_name %>)</h2>
 
-<%= start_form_tag({:action => 'update', :id => @auth_source}, :class => "tabular") %>
+<% form_tag({:action => 'update', :id => @auth_source}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
 
diff --git a/app/views/auth_sources/new.rhtml b/app/views/auth_sources/new.rhtml
index 29d66327..2d493dc3 100644
--- a/app/views/auth_sources/new.rhtml
+++ b/app/views/auth_sources/new.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_auth_source_new)%> (<%= @auth_source.auth_method_name %>)</h2>
 
-<%= start_form_tag({:action => 'create'}, :class => "tabular") %>
+<% form_tag({:action => 'create'}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_create) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/documents/edit.rhtml b/app/views/documents/edit.rhtml
index 3db4bcc6..0b9f31f8 100644
--- a/app/views/documents/edit.rhtml
+++ b/app/views/documents/edit.rhtml
@@ -1,8 +1,8 @@
 <h2><%=l(:label_document)%></h2>
 
-<%= start_form_tag({:action => 'edit', :id => @document}, :class => "tabular") %>
+<% form_tag({:action => 'edit', :id => @document}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
 
 
diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index d756aad6..b91ecb46 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -28,10 +28,10 @@
 
 
 <% if authorize_for('documents', 'add_attachment') %>
-  <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") %>
+  <% form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") do %>
     <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
     <%= image_to_function "add.png", "addFileField();return false" %></label>
     <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
   <%= submit_tag l(:button_add) %>
-  <%= end_form_tag %> 
+  <% end %> 
 <% end %>
diff --git a/app/views/enumerations/edit.rhtml b/app/views/enumerations/edit.rhtml
index 3002b593..7baea028 100644
--- a/app/views/enumerations/edit.rhtml
+++ b/app/views/enumerations/edit.rhtml
@@ -1,10 +1,10 @@
 <h2><%=l(:label_enumerations)%></h2>
 
-<%= start_form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") %>
+<% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
 
-<%= start_form_tag :action => 'destroy', :id => @enumeration %>
+<% form_tag({:action => 'destroy', :id => @enumeration}) do %>
   <%= submit_tag l(:button_delete) %>
-<%= end_form_tag %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/enumerations/new.rhtml b/app/views/enumerations/new.rhtml
index 0a773519..5c2ccd13 100644
--- a/app/views/enumerations/new.rhtml
+++ b/app/views/enumerations/new.rhtml
@@ -1,6 +1,6 @@
 <h2><%= l(@enumeration.option_name) %>: <%=l(:label_enumeration_new)%></h2>
 
-<%= start_form_tag({:action => 'create'}, :class => "tabular") %>
+<% form_tag({:action => 'create'}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_create) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/issue_categories/edit.rhtml b/app/views/issue_categories/edit.rhtml
index 053facbf..998dfbe7 100644
--- a/app/views/issue_categories/edit.rhtml
+++ b/app/views/issue_categories/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_issue_category)%></h2>
 
-<%= start_form_tag({:action => 'edit', :id => @category}, :class => "tabular") %>
+<% form_tag({:action => 'edit', :id => @category}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/issue_statuses/edit.rhtml b/app/views/issue_statuses/edit.rhtml
index 80f856a2..b81426a0 100644
--- a/app/views/issue_statuses/edit.rhtml
+++ b/app/views/issue_statuses/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_issue_status)%></h2>
 
-<%= start_form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") %>
+<% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/issue_statuses/new.rhtml b/app/views/issue_statuses/new.rhtml
index 2dacb1e2..ede1699b 100644
--- a/app/views/issue_statuses/new.rhtml
+++ b/app/views/issue_statuses/new.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_issue_status_new)%></h2>
 
-<%= start_form_tag({:action => 'create'}, :class => "tabular") %>
+<% form_tag({:action => 'create'}, :class => "tabular") do %>
   <%= render :partial => 'form' %>
   <%= submit_tag l(:button_create) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/issues/_add_shortcut.rhtml b/app/views/issues/_add_shortcut.rhtml
index f4890777..7cd3114c 100644
--- a/app/views/issues/_add_shortcut.rhtml
+++ b/app/views/issues/_add_shortcut.rhtml
@@ -1,5 +1,5 @@
 <% if authorize_for('projects', 'add_issue') %>
-<%= start_form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') %>
+<% form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') do %>
 <%= l(:label_issue_new) %>: <%= select_tag 'tracker_id', ("<option></option>" + options_from_collection_for_select(trackers, 'id', 'name')), :onchange => "if (this.value!='') {this.form.submit();}" %>
-<%= end_form_tag %>
+<% end %>
 <% end %>
diff --git a/app/views/issues/change_status.rhtml b/app/views/issues/change_status.rhtml
index 38ca82ea..96722569 100644
--- a/app/views/issues/change_status.rhtml
+++ b/app/views/issues/change_status.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2>
 
 <%= error_messages_for 'issue' %>
-<%= start_form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") %>
+<% form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") do %>
 
 <%= hidden_field_tag 'confirm', 1 %>
 <%= hidden_field_tag 'new_status_id', @new_status.id %>
@@ -34,4 +34,4 @@
 
 <%= hidden_field 'issue', 'lock_version' %>
 <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 29adf66a..865da965 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -56,13 +56,13 @@ end %>
 </div>
 
 <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
-  <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
+  <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
   <%=l(:label_change_status)%> :
   <select name="new_status_id">
   <%= options_from_collection_for_select @status_options, "id", "name" %>
   </select>
   <%= submit_tag l(:button_change) %>
-  <%= end_form_tag %>
+  <% end %>
 <% end %>
 &nbsp;
 </div>
@@ -90,22 +90,22 @@ end %>
 </table>
 <br />
 <% if authorize_for('issues', 'add_attachment') %>
-  <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") %>
+  <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
   <p id="attachments_p"><label><%=l(:label_attachment_new)%>
   <%= image_to_function "add.png", "addFileField();return false" %></label>
   <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
   <%= submit_tag l(:button_add) %>
-  <%= end_form_tag %> 
+  <% end %> 
 <% end %>
 </div>
 
 <% if authorize_for('issues', 'add_note') %>
   <div class="box">
   <h3><%= l(:label_add_note) %></h3>
-  <%= start_form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) %>
+  <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
   <p><label for="notes"><%=l(:field_notes)%></label>
     <%= text_area_tag 'notes', '', :cols => 60, :rows => 10  %></p>
   <%= submit_tag l(:button_add) %>
-  <%= end_form_tag %>  
+  <% end %>  
   </div>
 <% end %>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 61a44f09..09a43b46 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -29,7 +29,7 @@
   <div class="box">
   <h3><%=l(:field_password)%></h3>
 
-  <%= start_form_tag({:action => 'change_password'}, :class => "tabular") %>
+  <% form_tag({:action => 'change_password'}, :class => "tabular") do %>
 
   <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
   <%= password_field_tag 'password', nil, :size => 25 %></p>
@@ -41,6 +41,6 @@
   <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
 
   <center><%= submit_tag l(:button_save) %></center>
-  <%= end_form_tag %>
+  <% end %>
   </div>
 <% end %>
diff --git a/app/views/my/page_layout.rhtml b/app/views/my/page_layout.rhtml
index d3346bd7..4ad4c8e7 100644
--- a/app/views/my/page_layout.rhtml
+++ b/app/views/my/page_layout.rhtml
@@ -36,7 +36,7 @@ function removeBlock(block) {
 
 <div class="contextual">
 <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
-<%= start_form_tag({:action => "add_block"}, :id => "block-form") %>
+<% form_tag({:action => "add_block"}, :id => "block-form") do %>
 <%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %>
 <%= link_to_remote l(:button_add),
             :url => { :action => "add_block" },
@@ -47,7 +47,7 @@ function removeBlock(block) {
             :loading => "Element.show('indicator')",
             :loaded => "Element.hide('indicator')"
              %>
-<%= end_form_tag %> |
+<% end %> |
 <%= link_to l(:button_save), :action => 'page_layout_save' %> |
 <%= link_to l(:button_cancel), :action => 'page' %>
 </div>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index c3661b1f..3d4d0a4a 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -24,10 +24,10 @@
 </div>
 
 <% if authorize_for 'news', 'add_comment' %>
-<%= start_form_tag :action => 'add_comment', :id => @news %>
+<% form_tag({:action => 'add_comment', :id => @news}) do %>
 <%= error_messages_for 'comment' %>
 <p><label for="comment_comment"><%= l(:label_comment_add) %></label><br />
 <%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p>
 <%= submit_tag l(:button_add) %>
-<%= end_form_tag %>
+<% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index cb7a3bfe..2eef3e7b 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -2,7 +2,7 @@
 
 <div>
 <div class="rightbox">
-<%= start_form_tag %>
+<% form_tag do %>
 <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
 <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
 <p>
@@ -12,7 +12,7 @@
     <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%>
 </p>
 <p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
-<%= end_form_tag %>
+<% end %>
 </div>
 
 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
diff --git a/app/views/projects/add_document.rhtml b/app/views/projects/add_document.rhtml
index 57a62756..14434600 100644
--- a/app/views/projects/add_document.rhtml
+++ b/app/views/projects/add_document.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_document_new)%></h2>
 
-<%= start_form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) %>
+<% form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) do %>
 <%= render :partial => 'documents/form' %>
 
 <div class="box">
@@ -10,6 +10,6 @@
 </div>
 
 <%= submit_tag l(:button_create) %>
-<%= end_form_tag %>
+<% end %>
 
 
diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml
index 6efc1d2c..ecc9101d 100644
--- a/app/views/projects/add_file.rhtml
+++ b/app/views/projects/add_file.rhtml
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'attachment' %>
 <div class="box">
-<%= start_form_tag ({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") %>
+<% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
 
 <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
 <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
@@ -12,4 +12,4 @@
 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
 </div>
 <%= submit_tag l(:button_add) %>
-<%= end_form_tag %> 
\ No newline at end of file
+<% end %> 
\ No newline at end of file
diff --git a/app/views/projects/add_query.rhtml b/app/views/projects/add_query.rhtml
index 174a1bc2..5dbf881d 100644
--- a/app/views/projects/add_query.rhtml
+++ b/app/views/projects/add_query.rhtml
@@ -1,6 +1,6 @@
 <h2><%= l(:label_query_new) %></h2>
 
-<%= start_form_tag :action => 'add_query', :id => @project %>
+<% form_tag({:action => 'add_query', :id => @project}) do %>
   <%= render :partial => 'queries/form', :locals => {:query => @query} %>
   <%= submit_tag l(:button_create) %>
-<%= end_form_tag %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 809d593d..ec7d485e 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -1,6 +1,6 @@
 <h2><%= l(:label_calendar) %></h2>
 
-    <%= start_form_tag :action => 'calendar', :id => @project %>
+<% form_tag({:action => 'calendar', :id => @project}) do %>
 <table width="100%">
 <tr>
 <td align="left" style="width:150px">
@@ -22,7 +22,7 @@
 </td>
 </tr>
 </table>
-    <%= end_form_tag %>
+<% end %>
 <br />
 
 <table class="list with-cells">
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml
index c75c256c..e27a9ded 100644
--- a/app/views/projects/changelog.rhtml
+++ b/app/views/projects/changelog.rhtml
@@ -3,14 +3,14 @@
 <div>
 
 <div class="rightbox" style="width:140px;">
-<%= start_form_tag %>
+<% form_tag do %>
 <p><strong><%=l(:label_tracker_plural)%></strong></p>
 <% @trackers.each do |tracker| %>
   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
   <%= tracker.name %><br />
 <% end %>
 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
-<%= end_form_tag %>
+<% end %>
 </div>
 
 <% ver_id = nil
diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml
index d11705be..22b27e31 100644
--- a/app/views/projects/destroy.rhtml
+++ b/app/views/projects/destroy.rhtml
@@ -5,10 +5,10 @@
 <%=l(:text_project_destroy_confirmation)%></p>
 
 <p>
-    <%= start_form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) %>
+    <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) do %>
     <%= hidden_field_tag "confirm", 1 %>
     <%= submit_tag l(:button_delete) %>
-    <%= end_form_tag %>
+    <% end %>
 </p>
 </center>
 </div>
\ No newline at end of file
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index f20e9282..18e025f2 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -8,7 +8,7 @@
 <table width="100%">
 <tr>
 <td align="left">
-<%= start_form_tag %>
+<% form_tag do %>
 <p>
 <input type="text" name="months" size="2" value="<%= @months %>" />
 <%= l(:label_months_from) %>
@@ -17,7 +17,7 @@
 <%= hidden_field_tag 'zoom', @zoom %>
 <%= submit_tag l(:button_submit), :class => "button-small" %>
 </p>
-<%= end_form_tag %>
+<% end %>
 </td>
 <td align="right">
 <%= if @zoom < 4
diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
index 2d7fc1f5..3f8451ec 100644
--- a/app/views/projects/list_issues.rhtml
+++ b/app/views/projects/list_issues.rhtml
@@ -4,9 +4,9 @@
     </div>
     <h2><%=l(:label_issue_plural)%></h2>
     
-    <%= start_form_tag({:action => 'list_issues'}, :id => 'query_form') %>
+    <% form_tag({:action => 'list_issues'}, :id => 'query_form') do %>
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-    <%= end_form_tag %>
+    <% end %>
     <div class="contextual">
     <%= link_to_remote l(:button_apply), 
                        { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
@@ -42,7 +42,7 @@
 <p><i><%= l(:label_no_data) %></i></p>
 <% else %>
 &nbsp;
-<%= start_form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) %>	
+<% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>	
 <table class="list">
     <thead><tr>
         <th></th>
@@ -79,6 +79,6 @@
 <%= pagination_links_full @issue_pages %>
 [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
 </p>
-<%= end_form_tag %>
+<% end %>
 <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/projects/move_issues.rhtml b/app/views/projects/move_issues.rhtml
index 772cdeb0..57fc51e4 100644
--- a/app/views/projects/move_issues.rhtml
+++ b/app/views/projects/move_issues.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:button_move)%></h2>
 
 
-<%= start_form_tag({:action => 'move_issues', :id => @project}, :class => "tabular") %>
+<% form_tag({:action => 'move_issues', :id => @project}, :class => "tabular") do %>
 
 <div class="box">
 <p><label><%= l(:label_issue_plural) %>:</label>
@@ -21,4 +21,4 @@
 <%= select_tag "new_tracker_id", options_from_collection_for_select(@trackers, "id", "name") %></p>
 </div>
 <%= submit_tag l(:button_move) %>
-<%= end_form_tag %>
+<% end %>
diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml
index 423ff756..8b645320 100644
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -29,12 +29,12 @@
 	<td><%= member.user.display_name %></td>
     <td align="center">
         <% if authorize_for('members', 'edit') %>
-        <%= start_form_tag :controller => 'members', :action => 'edit', :id => member %>
+        <% form_tag({:controller => 'members', :action => 'edit', :id => member}) do %>
         <select name="member[role_id]">
         <%= options_from_collection_for_select @roles, "id", "name", member.role_id %>
         </select>
         <%= submit_tag l(:button_change), :class => "button-small" %>
-        <%= end_form_tag %>
+        <% end %>
         <% end %>
     </td>
     <td align="center">
@@ -47,7 +47,7 @@
 </table>
 <% if authorize_for('projects', 'add_member') %>
     <label><%=l(:label_member_new)%></label><br/>
-    <%= start_form_tag :controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project %>
+    <% form_tag({:controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project}) do %>
     <select name="member[user_id]">
     <%= options_from_collection_for_select @users, "id", "display_name", @member.user_id %>
     </select>
@@ -55,7 +55,7 @@
     <%= options_from_collection_for_select @roles, "id", "name", @member.role_id %>
     </select>
     <%= submit_tag l(:button_add) %>
-    <%= end_form_tag %>
+    <% end %>
 <% end %>
 </div>
 
@@ -80,17 +80,17 @@
 
 <div id="tab-content-categories" class="tab-content" style="display:none;">
 <table class="list">
-	<thead><th><%= l(:label_issue_status) %></th><th></th></thead>
+	<thead><th><%= l(:label_issue_category) %></th><th></th></thead>
 	<tbody>
 <% for @category in @project.issue_categories %>
 	<% unless @category.new_record? %>
 	<tr class="<%= cycle 'odd', 'even' %>">
     <td>
-        <%= start_form_tag :controller => 'issue_categories', :action => 'edit', :id => @category %>
+        <% form_tag({:controller => 'issue_categories', :action => 'edit', :id => @category}) do %>
         <%= text_field 'category', 'name', :size => 25  %>
         <% if authorize_for('issue_categories', 'edit') %>
         <%= submit_tag l(:button_save), :class => "button-small" %>
-        <%= end_form_tag %>
+        <% end %>
         <% end %>
     </td>
     <td align="center">
@@ -102,12 +102,12 @@
     </tbody>
 </table>
 <% if authorize_for('projects', 'add_issue_category') %>
-    <%= start_form_tag :action => 'add_issue_category', :tab => 'categories', :id => @project %>
+    <% form_tag({:action => 'add_issue_category', :tab => 'categories', :id => @project}) do %>
     <label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br/>
     <%= error_messages_for 'issue_category' %>
     <%= text_field 'issue_category', 'name', :size => 25 %>
     <%= submit_tag l(:button_create) %>
-    <%= end_form_tag %>
+    <% end %>
 <% end %>
 </div>
 
diff --git a/app/views/queries/edit.rhtml b/app/views/queries/edit.rhtml
index 71f146f1..337b498f 100644
--- a/app/views/queries/edit.rhtml
+++ b/app/views/queries/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%= l(:label_query) %></h2>
 
-<%= start_form_tag :action => 'edit', :id => @query %>
+<% form_tag({:action => 'edit', :id => @query}) do %>
   <%= render :partial => 'form', :locals => {:query => @query} %>
   <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index cdd4e688..828082e8 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -1,8 +1,8 @@
 <div class="contextual">
-<%= start_form_tag %>
+<% form_tag do %>
 <p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
 <%= submit_tag 'OK' %></p>
-<%= end_form_tag %>
+<% end %>
 </div>
 
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index f616a018..e32de5df 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -1,8 +1,8 @@
 <div class="contextual">
-<%= start_form_tag %>
+<% form_tag do %>
 <p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
 <%= submit_tag 'OK' %></p>
-<%= end_form_tag %>
+<% end %>
 </div>
 
 <h2><%= l(:label_revision) %> <%= @revision.identifier %></h2>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 6ab8df40..752be89a 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -1,8 +1,8 @@
 <div class="contextual">
-<%= start_form_tag %>
+<% form_tag do %>
 <p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
 <%= submit_tag 'OK' %></p>
-<%= end_form_tag %>
+<% end %>
 </div>
 
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %></h2>
diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml
index b544ab4c..620b3700 100644
--- a/app/views/roles/workflow.rhtml
+++ b/app/views/roles/workflow.rhtml
@@ -2,7 +2,7 @@
 
 <p><%=l(:text_workflow_edit)%>:</p>
 
-<%= start_form_tag ({:action => 'workflow'}, :method => 'get') %>
+<% form_tag ({:action => 'workflow'}, :method => 'get') do %>
 <div style="float:left;margin-right:10px;">
 <p><label for="role_id"><%=l(:label_role)%></label><br/>
 <select id="role_id" name="role_id">
@@ -19,13 +19,13 @@
 <%= submit_tag l(:button_edit) %>
 </p>
 </div>
-<%= end_form_tag %>
+<% end %>
   
   
 
 <% unless @tracker.nil? or @role.nil? %>
 <div class="box">
-  <%= form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) %>
+  <% form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
 	<table>
 	<tr>
 	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
@@ -63,7 +63,7 @@
 </p>
 <br />
 <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
+<% end %>
 
 <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index d1ec8220..625daa09 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%= l(:label_settings) %></h2>
 
-<%= start_form_tag({:action => 'edit'}, :class => "tabular") %>
+<% form_tag({:action => 'edit'}, :class => "tabular") do %>
 <div class="box">
 <p><label><%= l(:setting_app_title) %></label>
 <%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
@@ -34,4 +34,4 @@
 
 </div>
 <%= submit_tag l(:button_save) %>
-<%= end_form_tag %>
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 709aeb7a..c3d1fd79 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -2,7 +2,7 @@
 <h3><%= l(:label_project_plural) %></h3>
 
 <% @user.memberships.each do |membership| %>
-<%= start_form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") %>
+<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
 <p style="margin:0;padding-top:0;">
     <label><%= membership.project.name %></label>
     <select name="membership[role_id]">
@@ -11,12 +11,12 @@
     <%= submit_tag l(:button_change), :class => "button-small" %>
     <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :post => true, :class => 'icon icon-del' %>
 </p>
-<%= end_form_tag %>
+<% end %>
 <% end %>
 <hr />
 <p>
 <label><%=l(:label_project_new)%></label><br/>
-<%= start_form_tag({ :action => 'edit_membership', :id => @user }) %>
+<% form_tag({ :action => 'edit_membership', :id => @user }) do %>
 <select name="membership[project_id]">
 <%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
 </select>
@@ -24,6 +24,6 @@
 <%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
 </select>
 <%= submit_tag l(:button_add) %>
-<%= end_form_tag %>
+<% end %>
 </p>
 </div>
\ No newline at end of file
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 8e660329..36d0c438 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -28,7 +28,7 @@
 	<td align="center"><%= format_time(user.created_on) %></td>
 	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
   <td align="center">
-    <%= start_form_tag :action => 'edit', :id => user %>
+    <% form_tag({:action => 'edit', :id => user}) do %>
     <% if user.locked? %>
       <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
       <%= submit_tag l(:button_unlock), :class => "button-small"  %>
@@ -39,7 +39,7 @@
       <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
       <%= submit_tag l(:button_lock), :class => "button-small"  %>
     <% end %>
-    <%= end_form_tag %>  
+    <% end %>  
   </td>
   </tr>
 <% end %>