Cleanups for odd login cases