diff --git a/CVSROOT/commitcheck.pl b/CVSROOT/commitcheck.pl
index b9a375d2351..8aa5d719f31 100755
--- a/CVSROOT/commitcheck.pl
+++ b/CVSROOT/commitcheck.pl
@@ -313,20 +313,6 @@ if ($b eq 'BUGZILLA-3_0-BRANCH') {
 if (m:^mozilla/webtools/bugzilla/.*$:) {return '212';}
 }
 if ($b eq 'HEAD') {
-if (m:^mozilla/dbm/.*$:) {return '145';}
-if (m:^mozilla/security/coreconf/.*$:) {return '145';}
-if (m:^mozilla/security/dbm/.*$:) {return '145';}
-if (m:^mozilla/security/jss/.*$:) {return '145';}
-if (m:^mozilla/security/nss/.*$:) {return '145';}
-if (m:^mozilla/gfx/src/qt/.*$:) {return '161';}
-if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
-if (m:^mozilla/composer/.*$:) {return '173';}
-if (m:^mozilla/[^/]*$:) {return '19';}
-if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
-if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
-if (m:^mozilla/widget/src/xlib/.*$:) {return '121';}
-if (m:^mozilla/widget/src/xlibxtbin/.*$:) {return '121';}
-if (m:^mozilla/layout/mathml/.*$:) {return '165';}
 if (m:^mozilla/webtools/partytool/.*$:) {return '209';}
 if (m:^mozilla/browser/.*$:) {return '166';}
 if (m:^mozilla/other-licenses/branding/firefox/.*$:) {return '166';}
@@ -493,6 +479,20 @@ if (m:^CVSROOT/passwd$:) {return '3';}
 if (m:^mozilla/embedding/.*$:) {return '208';}
 if (m:^mozilla/string/.*$:) {return '160';}
 if (m:^mozilla/xpcom/string/.*$:) {return '160';}
+if (m:^mozilla/dbm/.*$:) {return '145';}
+if (m:^mozilla/security/coreconf/.*$:) {return '145';}
+if (m:^mozilla/security/dbm/.*$:) {return '145';}
+if (m:^mozilla/security/jss/.*$:) {return '145';}
+if (m:^mozilla/security/nss/.*$:) {return '145';}
+if (m:^mozilla/gfx/src/qt/.*$:) {return '161';}
+if (m:^mozilla/widget/src/qt/.*$:) {return '161';}
+if (m:^mozilla/composer/.*$:) {return '173';}
+if (m:^mozilla/[^/]*$:) {return '19';}
+if (m:^mozilla/extensions/p3p/.*$:) {return '162';}
+if (m:^mozilla/gfx/src/xlib/.*$:) {return '121';}
+if (m:^mozilla/widget/src/xlib/.*$:) {return '121';}
+if (m:^mozilla/widget/src/xlibxtbin/.*$:) {return '121';}
+if (m:^mozilla/layout/mathml/.*$:) {return '165';}
 }
 if ($b eq 'NSPRPUB_PRE_4_2_CLIENT_BRANCH') {
 if (m:^mozilla/nsprpub/.*$:) {return '146';}
diff --git a/CVSROOT/passwd b/CVSROOT/passwd
index e1b96fa88c4..b3680d2d0b5 100644
--- a/CVSROOT/passwd
+++ b/CVSROOT/passwd
@@ -42,7 +42,7 @@ bryner%brianryner.com:gy5stVpStoVNw:cvsuser
 bugreport%peshkin.net:PgnY246SzUcHk:cvsuser
 bugzilla%babylonsounds.com:/Cu/c717IBD1w:cvsuser
 bugzilla%glob.com.au:O.LFwfIctGxh6:cvsuser
-bugzilla%standard8.demon.co.uk:lmzqmqShGzGYs:cvsuser
+bugzilla%standard8.plus.com:lmzqmqShGzGYs:cvsuser
 burnus%gmx.de:RBozBY9sekJRM:cvsuser
 bz%barnson.org:hRMbA3bW5q6Ak:cvsuser
 bzbarsky%mit.edu:YySJ0ECW0UqcM:cvsuser