Nudging Login links to return to the current URL

This needs extra hints to make sure we keep pace with history-based
changes in URL, versus last known URL on the server.