diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java
index 0d04f828c..b81e7035a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/KdfParameters.java
@@ -64,8 +64,8 @@ public abstract class KdfParameters {
         abstract Builder digestAlgorithm(HashType digestAlgorithm);
         abstract Builder iterations(int iterations);
         abstract Builder saltPw1(byte[] saltPw1);
-        abstract Builder saltPw2(byte[] saltPw1);
-        abstract Builder saltPw3(byte[] saltPw1);
+        abstract Builder saltPw2(byte[] saltPw2);
+        abstract Builder saltPw3(byte[] saltPw3);
         abstract Builder hashUser(byte[] hashUser);
         abstract Builder hashAdmin(byte[] hashAdmin);
 
@@ -75,6 +75,13 @@ public abstract class KdfParameters {
 
         public Builder() {
             hasUsesKdf(false);
+            digestAlgorithm(HashType.SHA256);
+            iterations(0);
+            saltPw1(new byte[0]);
+            saltPw2(new byte[0]);
+            saltPw3(new byte[0]);
+            hashUser(new byte[0]);
+            hashAdmin(new byte[0]);
         }
 
         Builder parseKdfTLVs(Iso7816TLV[] tlvs) throws IOException {