Reset password cannot be completed

What are the steps required to reproduce the bug?

* Set permission to disallow users from modifying their username
* Create a new user with a temporary password
* User then resets their password
* User goes to one-time login and modifies password
* Click Save
* Error message indicating "E-mail address field is required."

What behavior were you expecting?

* The default email address that was set before (and visible) when they first log in is used when submitting the form

What happened instead?

* The e-mail password is not passed in the submission action. In this case, it appears as though the email is not passed and therefore the form fails.
* Furthermore, users cannot change their password because the email address is lost on the form