solves password reset issue
Merge branch 'develop'