Now offers a popup to login on site, previously only reported about invalid token, which wasn't clear to many users.

(cherry picked from commit c52cfd99)