modified the code to make sure user_person_id is available always
modified the code to make sure user_person_id is available always