diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index 73299293..8dab8129 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -1,10 +1,11 @@
 <%= error_messages_for 'role' %> 
 
+<% unless @role.builtin? %>
 <div class="box">
-<p><%= f.text_field :name, :required => true, :disabled => @role.builtin? %></p>
+<p><%= f.text_field :name, :required => true %></p>
 <p><%= f.check_box :assignable %></p>
 </div>
-
+<% end %>
 
 <h3><%= l(:label_permissions) %></h3>
 <div class="box">
diff --git a/app/views/roles/edit.rhtml b/app/views/roles/edit.rhtml
index 4a591e3e..e53a0f54 100644
--- a/app/views/roles/edit.rhtml
+++ b/app/views/roles/edit.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_role)%></h2> 
+<h2><%=l(:label_role)%>: <%= @role.name %></h2> 
 
 <% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>