#6 Api: reset password fails with "A second operation started
Code refactoring