working on fix for username/password login flow