Fixed bug regarding missing account_id