More Login Fixes and Testing