Some nice cleanup and fixing of the user/login classes.