diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ec2e6d60..7d0d40c0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 
 ## [Unreleased]
 
+### Fixed
+
+- autofill-parser: on some login forms, the "Create entry" button was not shown in the keyboard's suggestions strip
+
 ## [2.0.2] - 2026-09-15
 
 ### Added
diff --git a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt
index f7db9e3a1..c3c357a73 100644
--- a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt
+++ b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt
@@ -198,7 +198,7 @@ internal data class ClassifiedAutofillScenario<T : Any>(
     get() = currentPassword
 
   override val passwordFieldsToFillOnGenerate
-    get() = newPassword
+    get() = newPassword.ifEmpty { currentPassword }
 
   override val passwordFieldsToSave
     get() = newPassword.ifEmpty { currentPassword }
diff --git a/fastlane/metadata/android/en-US/changelogs/20002.txt b/fastlane/metadata/android/en-US/changelogs/20002.txt
index bd03bbe75..fae9a1552 100644
--- a/fastlane/metadata/android/en-US/changelogs/20002.txt
+++ b/fastlane/metadata/android/en-US/changelogs/20002.txt
@@ -4,7 +4,7 @@ Added
 - Sorting autofill suggestions by most recent usage
 - App setting "Ask to save passwords"
 
-### Fixed
+Fixed
 
 - Autofill-related issues
 - Clipped alert dialogs on short screens, such as front screens of foldables