Index: options.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Cgi/options.py,v
retrieving revision 2.40.2.3
diff -u -r2.40.2.3 options.py
--- options.py	3 Nov 2003 13:49:05 -0000	2.40.2.3
+++ options.py	11 Jan 2004 04:39:09 -0000
@@ -220,10 +220,15 @@
     # Authenticate, possibly using the password supplied in the login page
     password = cgidata.getvalue('password', '').strip()
 
-    if not mlist.WebAuthenticate((mm_cfg.AuthUser,
+    try:
+        ok = mlist.WebAuthenticate((mm_cfg.AuthUser,
                                   mm_cfg.AuthListAdmin,
                                   mm_cfg.AuthSiteAdmin),
-                                 password, user):
+                                 password, user)
+    except Errors.NotAMemberError:
+        # After the user change email, this error is raised if he hit a button.
+        ok = False
+    if not ok:
         # Not authenticated, so throw up the login page again.  If they tried
         # to authenticate via cgi (instead of cookie), then print an error
         # message.