[#1330] Use actual value of site_id for default