Fix some more login bugs