Continuing to refactor PasswordController.