diff --git a/app/views/workflows/edit.rhtml b/app/views/workflows/edit.rhtml
index 134dfb3e7..399825de2 100644
--- a/app/views/workflows/edit.rhtml
+++ b/app/views/workflows/edit.rhtml
@@ -7,52 +7,46 @@
 <p><%=l(:text_workflow_edit)%>:</p>
 
 <% form_tag({}, :method => 'get') do %>
-<p><label for="role_id"><%=l(:label_role)%>:</label>
-<select name="role_id">
-  <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
-</select>
+<p>
+	<label><%=l(:label_role)%>:</label>
+	<%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %>
 
-<label for="tracker_id"><%=l(:label_tracker)%>:</label>
-<select name="tracker_id">
-  <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
-</select>
-<%= submit_tag l(:button_edit), :name => nil %>
+  <label><%=l(:label_tracker)%>:</label>
+	<%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %>
+	
+	<%= submit_tag l(:button_edit), :name => nil %>
 </p>
 <% end %>
-  
-  
 
-<% unless @tracker.nil? or @role.nil? or @statuses.empty? %>
+
+<% if @tracker && @role && @statuses.any? %>
 <% form_tag({}, :id => 'workflow_form' ) do %>
 <%= hidden_field_tag 'tracker_id', @tracker.id %>
 <%= hidden_field_tag 'role_id', @role.id %>
 <table class="list">
 <thead>
 	<tr>
-	<th align="left"><%=l(:label_current_status)%></th>
-	<th align="center" colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
+		<th align="left"><%=l(:label_current_status)%></th>
+		<th align="center" colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
 	</tr>
 	<tr>
-	<td></td>
-	<% for new_status in @statuses %>
+		<td></td>
+		<% for new_status in @statuses %>
 		<td width="<%= 75 / @statuses.size %>%" align="center"><%= new_status.name %></td>
-	<% end %>
+		<% end %>
 	</tr>
 </thead>
 <tbody>
 	<% for old_status in @statuses %>
-		<tr class="<%= cycle("odd", "even") %>">
+	<tr class="<%= cycle("odd", "even") %>">
 		<td><%= old_status.name %></td>
 		<% new_status_ids_allowed = old_status.find_new_statuses_allowed_to([@role], @tracker).collect(&:id) -%>
 		<% for new_status in @statuses -%>
-			<td align="center">
-      <input type="checkbox"
-      name="issue_status[<%= old_status.id %>][]"
-      value="<%= new_status.id %>"
-      <%= 'checked="checked"' if new_status_ids_allowed.include? new_status.id %> />			
-			</td>
+		<td align="center">
+			<%= check_box_tag "issue_status[#{ old_status.id }][]", new_status.id, new_status_ids_allowed.include?(new_status.id) %>			
+		</td>
 		<% end -%>
-		</tr>
+	</tr>
 	<% end %>
 </tbody>
 </table>
@@ -60,7 +54,6 @@
 
 <%= submit_tag l(:button_save) %>
 <% end %>
-
 <% end %>
 
 <% html_title(l(:label_workflow)) -%>