diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi
index 4ad0720a93e..9f00e15aeab 100755
--- a/mozilla/webtools/bugzilla/buglist.cgi
+++ b/mozilla/webtools/bugzilla/buglist.cgi
@@ -200,12 +200,12 @@ sub GetGroupsByUserId {
     return if !$userid;
 
     SendSQL("
-        SELECT  groups.id, name, description, isactive
-          FROM  groups, user_group_map
-         WHERE  user_id = $userid AND NOT isbless
-           AND  user_group_map.group_id = groups.id
-           AND  isbuggroup
-      ORDER BY  description ");
+        SELECT DISTINCT  groups.id, name, description, isactive
+                   FROM  groups, user_group_map
+                  WHERE  user_id = $userid AND NOT isbless
+                    AND  user_group_map.group_id = groups.id
+                    AND  isbuggroup
+               ORDER BY  description ");
 
     my @groups;
 
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index 18f18e4743a..f529f13ea93 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -931,6 +931,7 @@ if ($::FORM{'keywords'}) {
 my $keywordaction = $::FORM{'keywordaction'} || "makeexact";
 
 if ($::comma eq ""
+    && (! @groupAdd) && (! @groupDel)
     && (! @::legal_keywords || (0 == @keywordlist && $keywordaction ne "makeexact"))
     && defined $::FORM{'masscc'} && ! $::FORM{'masscc'}
     ) {
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
index a9088a62d82..4121d029252 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
@@ -182,14 +182,14 @@
     [% FOREACH group = groups %]
     <tr>
       <td align="center">
-        <input type="radio" name="bit-[% group.bit %]" value="-1" checked="checked">
+        <input type="radio" name="bit-[% group.id %]" value="-1" checked="checked">
       </td>
       <td align="center">
-        <input type="radio" name="bit-[% group.bit %]" value="0">
+        <input type="radio" name="bit-[% group.id %]" value="0">
       </td>
       [% IF group.isactive %]
         <td align="center">
-          <input type="radio" name="bit-[% group.bit %]" value="1">
+          <input type="radio" name="bit-[% group.id %]" value="1">
         </td>
       [% ELSE %]
         <td>&nbsp;</td>