Fix resetting password

Login token is now in a hidden field in the form.

The login token in the password reset form was not added as a hidden
field, but was added in plain text at the top of the form. So when a
user is resetting their password and starts logged out, they won't be
logged in after changing their password.

Change-Id: Ic93965c2b6deeaaa7fe69614bb6a819db607a847
Merge "Fix resetting password" into REL1_19