diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb
index 6307ab85f8..a4d09be3c7 100644
--- a/app/views/roles/_form.html.erb
+++ b/app/views/roles/_form.html.erb
@@ -50,11 +50,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 <% if role.new_record? || role.is_a?(GlobalRole) %>
   <div id="global_permissions" style=<%= role.new_record? && !role.is_a?(GlobalRole) ? "display:none" : ""%> >
-    <%= render :partial => "permissions", :locals => {:permissions => global_permissions, :role => role }%>
+    <%= render :partial => "permissions", :locals => {:permissions => global_permissions, :role => role, :globalRole => "true" }%>
   </div>
 <% end %>
 <% if role.new_record? || !role.is_a?(GlobalRole) %>
   <div id="member_permissions" style=<%= role.new_record? && role.is_a?(GlobalRole) ? "display:none" : ""%>>
-    <%= render :partial => "permissions", :locals => {:permissions => member_permissions, :role => role }%>
+    <%= render :partial => "permissions", :locals => {:permissions => member_permissions, :role => role, :globalRole => "false" }%>
   </div>
 <% end %>
diff --git a/app/views/roles/_permissions.html.erb b/app/views/roles/_permissions.html.erb
index 008e728a19..8ca2f83ee7 100644
--- a/app/views/roles/_permissions.html.erb
+++ b/app/views/roles/_permissions.html.erb
@@ -20,7 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 <% perms_by_module = permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
-  <fieldset class="form--fieldset">
+  <% if globalRole === 'false' %>
+    <fieldset class="form--fieldset" id="<%= mod.blank? ? 'fieldset--' + Project.model_name.human.downcase.gsub(' ', '_') : 'fieldset--' + l_or_humanize(mod, :prefix => 'project_module_').downcase.gsub(' ', '_') %>">
+  <% else %>
+    <fieldset class="form--fieldset" id="<%= mod.blank? ? 'fieldset--global--' + Project.model_name.human.downcase.gsub(' ', '_') : 'fieldset--global--' + l_or_humanize(mod, :prefix => 'project_module_').downcase.gsub(' ', '_') %>">
+  <% end %>
+
     <legend class="form--fieldset-legend">
       <%= mod.blank? ? Project.model_name.human : l_or_humanize(mod, :prefix => 'project_module_') %>
     </legend>
@@ -30,7 +35,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
         </label>
     <% end %>
+
+    <% if globalRole === 'false' %>
+      <br /><%= check_all_links (mod.blank? ? 'fieldset--' + Project.model_name.human.downcase.gsub(' ', '_') : 'fieldset--' + l_or_humanize(mod, :prefix => 'project_module_').downcase.gsub(' ', '_')) %>
+    <% else %>
+      <br /><%= check_all_links (mod.blank? ? 'fieldset--global--' + Project.model_name.human.downcase.gsub(' ', '_') : 'fieldset--global--' + l_or_humanize(mod, :prefix => 'project_module_').downcase.gsub(' ', '_')) %>
+    <% end %>
+
   </fieldset>
 <% end %>
-<br /><%= check_all_links permissions_id(permissions) %>
 <%= hidden_field_tag 'role[permissions][]', '' %>