GetEntityFrom now finds the given entity by email _or_ by name,
whichever is passed in