Pull Doug's new login stuff into my fork