Add password recovery to avoid post misdirection