Fix identity selection.