Accounts: Work around cyclic validation errors