Parser shouldn't munch the value put into the model.

Also, remove cruft.
Change of model value name.
Match up required message with proper field (password2).