diff --git a/webtools/bugzilla/checksetup.pl b/webtools/bugzilla/checksetup.pl
index f670425999fb..7c44eaa6807e 100755
--- a/webtools/bugzilla/checksetup.pl
+++ b/webtools/bugzilla/checksetup.pl
@@ -3863,12 +3863,18 @@ if ($sth->rows == 0) {
 # Support for quips approval
 AddField('quips', 'approved', 'tinyint(1) NOT NULL  DEFAULT 1');
  
-# 2002-11-XX Bug 180870 - remove manual shadowdb replication code
+# 2002-12-20 Bug 180870 - remove manual shadowdb replication code
 if (TableExists('shadowlog')) {
     print "Removing shadowlog table\n";
     $dbh->do("DROP TABLE shadowlog");
 }
 
+# 2003-04-24 - myk@mozilla.org/bbaetz@acm.org, bug 201018
+# Force all cached groups to be updated at login, due to security
+# At the next schema change, this should be moved inside that block so that the
+# update doesn't happen on every run
+$dbh->do("UPDATE profiles SET refreshed_when='1900-01-01 00:00:00'");
+
 #
 # Final checks...
 
diff --git a/webtools/bugzilla/editusers.cgi b/webtools/bugzilla/editusers.cgi
index 4e423c2d5418..143e87442951 100755
--- a/webtools/bugzilla/editusers.cgi
+++ b/webtools/bugzilla/editusers.cgi
@@ -785,6 +785,8 @@ if ($action eq 'update') {
                 "VALUES " .  "($thisuserid, $::userid, now(), $fieldid, " .  
                 SqlQuote(join(", ",@grpdel)) . ", " .
                 SqlQuote(join(", ",@grpadd)) . ")");
+        SendSQL("UPDATE profiles SET refreshed_when='1900-01-01 00:00:00' " .
+                "WHERE userid = $thisuserid");
     }
 
 
@@ -842,6 +844,7 @@ if ($action eq 'update') {
 
         print "Updated user's name.<BR>\n";
     }
+    DeriveGroup($thisuserid);
 
     PutTrailer($localtrailer);
     exit;