1 files changed, 3 insertions, 1 deletions
diff --git a/g10/card-util.c b/g10/card-util.c
index 367e31538..e33a41706 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -2017,7 +2017,9 @@ gen_kdf_data (unsigned char *data, int single_salt)
   gcry_randomize (p, 8, GCRY_STRONG_RANDOM);
   p += 8;
 
-  if (!single_salt)
+  if (single_salt)
+    salt_admin = salt_user;
+  else
     {
       memcpy (p, h2, sizeof h2);
       p += sizeof h2;