fixed issue with account id not being set properly