When the user redirects to the Change password page from the email's One-time...

When the user redirects to the Change password page from the email's One-time reset link.
On that page, Fields were missing to reset passwords, Because this module will create a separate tab to update the password.

When a user clicks on Update password tab, The URL changed and the token for resetting the password is removed from url. So the user is not able to reset the password.

In the given MR I have moved the update password fields to the One-time login, edit profile page, So that the user can update the password on the same page, and it works for me.

Please review.