FIX #2496 `ConfirmedPasswordField` mismatch passwords saved

Fixes #2496

Also fixes another issue where 'Password' is hard coded as field name in `validate()`
Merge pull request #2575 from dhensby/patch-2

FIX #2496 `ConfirmedPasswordField` mismatch passwords saved