diff --git a/src/cardos.hxx b/src/cardos.hxx
index 58e27ce..560d022 100644
--- a/src/cardos.hxx
+++ b/src/cardos.hxx
@@ -1091,8 +1091,8 @@ namespace cardos {
         CRYPTOLOG("log");
         pcsc::Connection::Reader::Transaction lock(_reader);
         if (transportState()) {
-          if (sigGPinRetries()!=-1)     changeSigGPin(newPin, oldPin);
-          if (pkcs15PinRetries()!=-1)   changePkcs15Pin(newPin, oldPin);
+          changeSigGPin(newPin, oldPin);
+          changePkcs15Pin(newPin, oldPin);
         } else {
           if (pkcs15PinRetries()!=-1)   changePkcs15Pin(newPin, oldPin);
           try {