Make identity UI friendlier