Fix bug move try catch on the resetPassword method call and so add return statement
Merge branch 'DS-1624' into DS-1622