Comment 5 for bug 1314827

Finally tested this and it helps me with situations I've seen where my libraries link from their websites to the login page directly and get redirected to the wrong place.

Pushed to master and backported for rel_2_7, rel_2_6, and rel_2_5.