Potentially better PIN handling