Correctly setting the account id