Fix problem with first and last name being updated