Backport remove echo from lost password page

Fixes #1075