Actually I disagree with that approach. It's how we had it.
Loging in is not a location, it's a modal dialog. It's a prompt to have you authenticate. It's not where you want to be. There is no reason to navigate there on purpose. Logout is just an action that results in the modal showing.
I also wanted to avoid the step of keeping the URL the user actually wanted to go to and then changing it after login. But it appears I will have to do that regardless.
Loging in is not a location, it's a modal dialog. It's a prompt to have you authenticate. It's not where you want to be. There is no reason to navigate there on purpose. Logout is just an action that results in the modal showing.
I also wanted to avoid the step of keeping the URL the user actually wanted to go to and then changing it after login. But it appears I will have to do that regardless.