Hardened the forgotten password process further against user error.