Fix allowing old password of current user

Change-Id: I21ffbf4344dbb5f760d2e1ece01efd51e15175db