Merge pull request #1065 from pixelated/diagram-account-recovery