diff --git a/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.kt b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.kt
index b9cf0585d..7cae6600f 100644
--- a/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/crypto/keyDerivation/AesKdf.kt
@@ -42,7 +42,7 @@ class AesKdf : KdfEngine() {
             }
         }
 
-    override val defaultKeyRounds: Long = 6000L
+    override val defaultKeyRounds: Long = 500000L
 
     override fun getName(resources: Resources): String {
         return resources.getString(R.string.kdf_AES)
diff --git a/app/src/main/jni/final_key/kpd_jni.c b/app/src/main/jni/final_key/kpd_jni.c
index 670e97009..e3e1eb4ad 100644
--- a/app/src/main/jni/final_key/kpd_jni.c
+++ b/app/src/main/jni/final_key/kpd_jni.c
@@ -473,7 +473,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_kunzisoft_keepass_crypto_finalkey_NativeAE
   (*env)->GetByteArrayRegion(env, seed, 0, MASTER_KEY_SIZE, (jbyte *)mk.c_seed);
   (*env)->GetByteArrayRegion(env, key, 0, MASTER_KEY_SIZE, (jbyte *)mk.key1);
 
-  // step 2: encrypt the hash "rounds" (default: 6000) times
+  // step 2: encrypt the hash "rounds"
   iret = pthread_create( &t1, NULL, (void*)generate_key_material, (void*)&mk );
   if( iret != 0 ) {
     (*env)->ThrowNew(env, bad_arg, "TransformMasterKey: failed to launch thread 1"); // FIXME: get a better exception class for this...