Show password reset expired message rather than server error if that's what has happened
Merge branch 'master' of github.com:sharelatex/web-sharelatex