Whoops.  I think we've started to confuse the flow again here.  You should be checking the session for some setting, not the url in the strange recursive flow.  We changed all these URLs so that it was a clear process of walking a user though.  I would go back to that.