more bug fixes

discovered when changing eID-PIN of nPA on the card reader.