diff --git a/controllers/admin/gamification_plugin_badges_controller.rb b/controllers/admin/gamification_plugin_badges_controller.rb
index 18803e0..2ccd61d 100644
--- a/controllers/admin/gamification_plugin_badges_controller.rb
+++ b/controllers/admin/gamification_plugin_badges_controller.rb
@@ -1,7 +1,7 @@
 class GamificationPluginBadgesController < PluginAdminController
 
   def index
-    @gamification_plugin_badges = environment.gamification_plugin_badges
+    @gamification_plugin_badges = environment.gamification_plugin_badges.group_by(&:owner)
   end
 
   def show
diff --git a/views/gamification_plugin_badges/index.html.erb b/views/gamification_plugin_badges/index.html.erb
index 08e1913..952fd3e 100644
--- a/views/gamification_plugin_badges/index.html.erb
+++ b/views/gamification_plugin_badges/index.html.erb
@@ -10,7 +10,11 @@
     <th></th>
   </tr>
 
-<% @gamification_plugin_badges.each do |gamification_plugin_badge| %>
+<% @gamification_plugin_badges.each do |owner, badges| %>
+  <% if owner.present? %>
+    <tr><th colspan="6"><%= _("Badges for:") %> <%= owner.name %></th></tr>
+  <% end %>
+  <% badges.each do |gamification_plugin_badge| %>
   <tr>
     <td><%= gamification_plugin_badge.name %></td>
     <td><%= gamification_plugin_badge.title %></td>
@@ -19,6 +23,7 @@
     <td><%= link_to 'Edit', :action => :edit, :id => gamification_plugin_badge.id %></td>
     <td><%= button_without_text :delete, _('Remove'), {:action => :destroy, :id => gamification_plugin_badge.id}, :method => :post, :confirm => _('Are you sure?') %></td>
   </tr>
+  <% end %>
 <% end %>
 </table>
 
--
libgit2 0.21.2