OE-3321 - Fixed showing site and firm dialog on page load