updated the code to make sure that user_person_id is available always
Merge branch 'master' of github.com:BaobabHealthTrust/IPD