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