Move this into discoverUserInfoService & remove the extra code that checks whether options exists.