Backport fix to UserAdmin site_id