with login, a few things to fix