with login, few things left to fix