updates for new wagn account handling