Don't force log in, bug fixes

Bugs, bugs, everywhere.