Remade 'Change Password' form [MJ-359]

Changed the form needing current password twice and new password once to current password once and new password twice. Also changed tests that were testing the 'old' way. All tests pass