More fixups to login sequence.

Core:\n- Fixing a small issue with login sequence that relied on db.