diff --git a/app/views/admin/locations/_location.html.haml b/app/views/admin/locations/_location.html.haml
index 3759997..197a483 100644
--- a/app/views/admin/locations/_location.html.haml
+++ b/app/views/admin/locations/_location.html.haml
@@ -3,4 +3,8 @@
     = link_to image("location", :class => "icon", :alt => 'page-icon', :title => '') + '<span class="title">' + h(location.name) +'</span>', edit_admin_location_url(location)
     %small.info
       = h location.full_address
+      
+  - if config['locations.use_groups?']
+    %td
+      = location.group
   %td.remove= link_to image('remove', :alt => 'remove location'), remove_admin_location_path(location)
\ No newline at end of file
diff --git a/app/views/admin/locations/index.html.haml b/app/views/admin/locations/index.html.haml
index 6045463..2e7ff94 100644
--- a/app/views/admin/locations/index.html.haml
+++ b/app/views/admin/locations/index.html.haml
@@ -7,6 +7,9 @@
     %tr
       %th.snippet
         Location
+      - if config['locations.use_groups?'] && !@locations.blank?
+        %th
+          Group
       %th.modify
         Modify
   %tbody