Fix up login flow