enable password_reset functional
Merge branch 'password_reset'