Main account id fix