WIP on more login/auth issues