Accounts for inactive users can only be resolved by account id (and 'self' but 'self' is not useful in this context) by the back-end. Use account id when available to resolve accounts. Bug: Issue 11367 Change-Id: I99d4acb9e0a7708912b718aa1104f98af82fb608