Bug 409166 - Calculation of id for new site incorrect