First pass at properly handling account codes in forwarding