fix bug - if identity is other than email or username, user can not change password.
Merge pull request #576 from sitorush/2

fix bug with identity