Make setup flow not break logins