More Login Cleanup