Handle WebUsers and domains properly in ES