Fixing various sign-in flow issues