diff --git a/docs/src/content/docs/changelog.mdx b/docs/src/content/docs/changelog.mdx
index 4b399a8db..786eaa26c 100644
--- a/docs/src/content/docs/changelog.mdx
+++ b/docs/src/content/docs/changelog.mdx
@@ -75,6 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add method `Close` on `sqlite` service to close the DB manually by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
 - Add cancellation support for query methods on `sqlite` service by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
 - Add prepared statement support to `sqlite` service with JS bindings by [@fbbdev](https://github.com/fbbdev) in [#4067](https://github.com/wailsapp/wails/pull/4067)
+- Fix auto save and password auto save always enabled by [@oSethoum](https://github.com/osethoum) in [#4134](https://github.com/wailsapp/wails/pull/4134)
 - Add `SetMenu()` on window to allow for setting a menu on a window by [@leaanthony](https://github.com/leaanthony)
 - Add Notification support by [@popaprozac] in [#4098](https://github.com/wailsapp/wails/pull/4098)
 -  Add File Association support for mac by [@wimaha](https://github.com/wimaha) in [#4177](https://github.com/wailsapp/wails/pull/4177)
diff --git a/v3/pkg/application/webview_window_windows.go b/v3/pkg/application/webview_window_windows.go
index 3ff9aff9c..05647b09b 100644
--- a/v3/pkg/application/webview_window_windows.go
+++ b/v3/pkg/application/webview_window_windows.go
@@ -1672,26 +1672,21 @@ func (w *windowsWebviewWindow) setupChromium() {
 
 	}
 
-	if opts.GeneralAutofillEnabled {
-		err = chromium.PutIsGeneralAutofillEnabled(true)
-		if err != nil {
-			if errors.Is(edge.UnsupportedCapabilityError, err) {
-				// warning
-				globalApplication.warning("unsupported capability: GeneralAutofillEnabled")
-			} else {
-				globalApplication.handleFatalError(err)
-			}
+	err = chromium.PutIsGeneralAutofillEnabled(opts.GeneralAutofillEnabled)
+	if err != nil {
+		if errors.Is(err, edge.UnsupportedCapabilityError) {
+			globalApplication.warning("unsupported capability: GeneralAutofillEnabled")
+		} else {
+			globalApplication.handleFatalError(err)
 		}
 	}
 
-	if opts.PasswordAutosaveEnabled {
-		err = chromium.PutIsPasswordAutosaveEnabled(true)
-		if err != nil {
-			if errors.Is(edge.UnsupportedCapabilityError, err) {
-				globalApplication.warning("unsupported capability: PasswordAutosaveEnabled")
-			} else {
-				globalApplication.handleFatalError(err)
-			}
+	err = chromium.PutIsPasswordAutosaveEnabled(opts.PasswordAutosaveEnabled)
+	if err != nil {
+		if errors.Is(err, edge.UnsupportedCapabilityError) {
+			globalApplication.warning("unsupported capability: PasswordAutosaveEnabled")
+		} else {
+			globalApplication.handleFatalError(err)
 		}
 	}