Fix up weirdness with logins