Reset password fix

New password always set to empty due to incorrect field names. Fixed.
Password fields not compared. Fixed.