diff --git a/src/fr/anssi/smartpgp/Persistent.java b/src/fr/anssi/smartpgp/Persistent.java
index 6c28328..1b4f976 100644
--- a/src/fr/anssi/smartpgp/Persistent.java
+++ b/src/fr/anssi/smartpgp/Persistent.java
@@ -236,8 +236,8 @@ public final class Persistent {
         Common.beginTransaction(isRegistering);
         user_pin_length = (byte)Constants.USER_PIN_DEFAULT.length;
         user_pin.update(Constants.USER_PIN_DEFAULT, (short)0, user_pin_length);
-        user_pin.resetAndUnblock();
         Common.commitTransaction(isRegistering);
+        user_pin.resetAndUnblock();
 
         Common.beginTransaction(isRegistering);
         user_puk_length = (short)0;
@@ -253,8 +253,8 @@ public final class Persistent {
         Common.beginTransaction(isRegistering);
         admin_pin_length = (byte)Constants.ADMIN_PIN_DEFAULT.length;
         admin_pin.update(Constants.ADMIN_PIN_DEFAULT, (short)0, admin_pin_length);
-        admin_pin.resetAndUnblock();
         Common.commitTransaction(isRegistering);
+        admin_pin.resetAndUnblock();
 
         isTerminated = false;
     }
diff --git a/src/fr/anssi/smartpgp/SmartPGPApplet.java b/src/fr/anssi/smartpgp/SmartPGPApplet.java
index 350a7e7..c647258 100644
--- a/src/fr/anssi/smartpgp/SmartPGPApplet.java
+++ b/src/fr/anssi/smartpgp/SmartPGPApplet.java
@@ -767,10 +767,17 @@ public final class SmartPGPApplet extends Applet implements ExtendedLength {
 
         case (byte)0x02:
             assertAdmin();
-            if((lc < Constants.USER_PIN_MIN_SIZE) ||
-               (lc > Constants.USER_PIN_MAX_SIZE)) {
-                ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
-                return;
+            if(data.keyDerivationIsActive()) {
+                if(lc != data.keyDerivationSize()) {
+                    ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
+                    return;
+                }
+            } else {
+                if((lc < Constants.USER_PIN_MIN_SIZE) ||
+                   (lc > Constants.USER_PIN_MAX_SIZE)) {
+                    ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
+                    return;
+                }
             }
             transients.setUserPinMode81(false);
             transients.setUserPinMode82(false);
@@ -1142,10 +1149,17 @@ public final class SmartPGPApplet extends Applet implements ExtendedLength {
 
             case Constants.TAG_RESETTING_CODE:
                 assertAdmin();
-                if((lc < Constants.USER_PUK_MIN_SIZE) ||
-                   (lc > Constants.USER_PUK_MAX_SIZE)) {
-                    ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
-                    return;
+                if(data.keyDerivationIsActive()) {
+                    if(lc != data.keyDerivationSize()) {
+                        ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
+                        return;
+                    }
+                } else {
+                    if((lc < Constants.USER_PUK_MIN_SIZE) ||
+                       (lc > Constants.USER_PUK_MAX_SIZE)) {
+                        ISOException.throwIt(ISO7816.SW_WRONG_LENGTH);
+                        return;
+                    }
                 }
                 JCSystem.beginTransaction();
                 data.user_puk_length = (byte)lc;