[Fix Bug 932776] Make external accounts unique by (identifier, type)
Merge pull request #724 from Sancus/932776-duplicateaccounts

[Fix Bug 932776] Make external accounts unique by (identifier, type)