EZP-21633: Fix siteaccess injection which fails in some cases, take 2