Fix ordering of fields, make sure password check is after password