Fix saving of first_name and last_name