diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index 409753d1..40532eb7 100644
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -1,6 +1,4 @@
 <?php # $Id$
-# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
-# All rights reserved.  See LICENSE file for licensing details
 
 if (IN_serendipity !== true) {
     die ('Don\'t hack!');
@@ -255,7 +253,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
     $data['available_groups'] = $available_groups;
     $groupnames = array();
     foreach($available_groups as $available_group) {
-        $groupnames[$available_name] = serendipity_groupname($available_group);
+        $groupnames[$available_group] = serendipity_groupname($available_group);
     }
     $data['groupnames'] = $groupnames;
     $data['pluggroups'] = $pluggroups;
@@ -418,6 +416,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
     serendipity_plugin_api::hook_event('backend_plugins_sidebar_header', $serendipity);
     $data['backend_plugins_sidebar_header'] = ob_get_contents();
     ob_end_clean();
+
     ob_start();
     show_plugins(false, $sidebars);
     $data['sidebar_plugins'] = ob_get_contents();
@@ -427,6 +426,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
     serendipity_plugin_api::hook_event('backend_plugins_event_header', $serendipity);
     $data['backend_plugins_event_header'] = ob_get_contents();
     ob_end_clean();
+
     ob_start();
     show_plugins(true);
     $data['event_plugins'] = ob_get_contents();
@@ -446,4 +446,5 @@ $serendipity['smarty']->assign($data);
 $tfile = dirname(__FILE__) . "/tpl/plugins.inc.tpl";
 $content = $serendipity['smarty']->fetch('file:'. $tfile);
 echo $content;
+
 /* vim: set sts=4 ts=4 expandtab : */
diff --git a/include/admin/tpl/plugins.inc.tpl b/include/admin/tpl/plugins.inc.tpl
index 992b84da..ccb6dc42 100644
--- a/include/admin/tpl/plugins.inc.tpl
+++ b/include/admin/tpl/plugins.inc.tpl
@@ -71,8 +71,8 @@
                             <input type="hidden" name="serendipity[type]" value="{$type|escape:"html"}" />
                             {$CONST.FILTERS}
                                 <select name="serendipity[only_group]">
-                                    {foreach available_groups as $available_group}
-                                        <option value="{$available_group}" {if $only_group == $available_group} selected="selected"{/if}>{$groupnames.{$available_group}}</option>
+                                    {foreach $groupnames as $available_group => $available_name}
+                                        <option value="{$available_group}" {if $only_group == $available_group} selected="selected"{/if}>{$available_name}</option>
                                     {/foreach}
                                     <option value="ALL" {if $only_group == ALL} selected="selected"{/if}>{$CONST.ALL_CATEGORIES}</option>
                                     <option value="UPGRADE" {if $only_group == UPGRADE} selected="selected"{/if}>{$CONST.WORD_NEW}</option>
@@ -84,7 +84,7 @@
                 {if !empty($only_group)}{continue}{/if}
             {elseif !empty($only_group) && $pluggroup != $only_group}{continue}{else}
                 <tr>
-                    <td colspan="2" class="serendipity_pluginlist_section"><strong>{$groupnames.{$available_group}}</strong></td>
+                    <td colspan="2" class="serendipity_pluginlist_section"><strong>{foreach $groupnames as $available_group => $available_name}{if $pluggroup == $available_group}{$available_name}{/if}{/foreach}</strong></td>
                 </tr>
             {/if}
             <tr>