diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
index 12e85ff7..3344a004 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/PGPainless.kt
@@ -57,7 +57,10 @@ class PGPainless(
         creationTime: Date = Date()
     ): OpenPGPKeyGenerator =
         OpenPGPKeyGenerator(
-                implementation, version.numeric, version == OpenPGPKeyVersion.v6, creationTime)
+                implementation,
+                version.numeric,
+                algorithmPolicy.keyProtectionSettings.aead,
+                creationTime)
             .setAlgorithmSuite(algorithmPolicy.keyGenerationAlgorithmSuite)
 
     /**