the code I gave regarding not hanging the admin password, something similar needs be done to the "allow user to logon" for the admin user (I think this is under the member management section)

apart from that, I think you are almost ready for one final "thrash" before submitting to 1-click list (except for that "the last bug" I have eluded to)