Fix forgot password pages.
Merge branch 'master' into live