After changing country reset token expires

I'm using Address Field 7.x-1.1 in my site. Now I'm facing a very critical issue, while creating a new account. In my site user can register an account by entering only e-mail address. For this I'm using Email Registration module. After submitting the email, user will get the password reset link (Note: I've set the Require a verification e-mail, but wait for the approval e-mail to let users set their password. option in Account settings). Once user login with reset link, he should be able to set his password. It works well, if user didn't changed his country. If the user has changed the country, Then he will get the error message: Your current password is missing or incorrect; it's required to change the Password. But user hasn't yet set any password in this case. And he is accessing the site with reset link. Please anyone help me to fix this issue.

Here is the steps to reproduce the bug.

1. Set the option: Require a verification e-mail, but wait for the approval e-mail to let users set their password. In Configuration > People > Account settings
2. Create a field with field type Address field, In Configuration > People > Account settings > Manage fields
3. Create a new account
4. Access the account with reset link.
5. Change the country.
6. Fill up the other fields and save.
7. Now you will get an error message saying Your current password is missing or incorrect; it's required to change the Password.