Bug fix: variable name mismatch
Bug fix: password reset doc not removed afterward