P2 "fix"; Backported from release-239

Merge pull request #4507 from Wikia/CONN-587
CONN-587 - broken "Forgot your password?" functionality