resetPassword: fixed bug that caused 500 Internal Server error in backend
Merge remote-tracking branch 'origin/master'