Original URL request parameters are lost when going through log in screen

I don't know what happened in #1985, but this didn't get applied to master or stage.