When looking up identity, use the ID already in the loggedInUser
 - not totally sure why, but when looking up by name and type it wasn't finding a match and NPEing
Merge branch 'EVENT-118' into dev