Add back check for first and last name