Routing for "Already have an Account?" and "Don't have an account?" Buttons

Hello all,

I have implemented the new universal login, and when I click on the login button and then click on “don’t have an account? Sign up” button it takes me to the returnTo path of the original login instead of what should be the sign up returnTo. I’m trying to learn how to add conditions to avoid this but am getting stuck.