Should check also the user data if exists
Merge pull request #294 from CruGlobal/MH-887

Should check also the user data if exists