More sensible identity selection