diff --git a/mozilla/webtools/bugzilla/editgroups.cgi b/mozilla/webtools/bugzilla/editgroups.cgi
index 02f24b1e4dd..f7362cb5fa2 100755
--- a/mozilla/webtools/bugzilla/editgroups.cgi
+++ b/mozilla/webtools/bugzilla/editgroups.cgi
@@ -599,7 +599,7 @@ sub doGroupChanges {
             $b =~ /^oldgrp-(\d+)$/;
             my $v = $1;
             my $grp = $cgi->param("grp-$v") || 0;
-            if (($cgi->param("oldgrp-$v") != $grp) && ($v != $gid)) {
+            if (($v != $gid) && ($cgi->param("oldgrp-$v") != $grp)) {
                 $chgs = 1;
                 if ($grp != 0) {
                     SendSQL("INSERT INTO group_group_map 
@@ -613,7 +613,8 @@ sub doGroupChanges {
             }
 
             my $bless = $cgi->param("bless-$v") || 0;
-            if ($cgi->param("oldbless-$v") != $bless) {
+            my $oldbless = $cgi->param("oldbless-$v");
+            if ((defined $oldbless) and ($oldbless != $bless)) {
                 $chgs = 1;
                 if ($bless != 0) {
                     SendSQL("INSERT INTO group_group_map 
diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl
index 92b8e9c2ee4..610d3102ef0 100644
--- a/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/admin/groups/edit.html.tmpl
@@ -154,9 +154,10 @@
           </td>
         [% ELSE %]
           <td>
+            <input type="hidden" name="oldbless-[% group.grpid FILTER html %]" value="0">
           </td>
           <td>
-            <input type="hidden" name="oldgrp-[% group.grpid FILTER html %]" value="">
+            <input type="hidden" name="oldgrp-[% group.grpid FILTER html %]" value="0">
           </td>
         [% END %]
         <td align="left" class="groupname">