diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart
index 0c61abb0d..6b24c9d28 100644
--- a/flutter/lib/common/widgets/dialog.dart
+++ b/flutter/lib/common/widgets/dialog.dart
@@ -507,6 +507,10 @@ _connectDialog(
       final osPassword = osPasswordController?.text.trim() ?? '';
       final password = passwordController?.text.trim() ?? '';
       if (passwordController != null && password.isEmpty) return;
+      if (rememberAccount) {
+        bind.sessionPeerOption(id: id, name: 'os-username', value: osUsername);
+        bind.sessionPeerOption(id: id, name: 'os-password', value: osPassword);
+      }
       gFFI.login(
         osUsername,
         osPassword,
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 7a9ab86c2..1a8d807bc 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -1143,7 +1143,6 @@ impl Connection {
     }
 
     fn validate_password(&mut self) -> bool {
-        return true;
         if password::temporary_enabled() {
             let password = password::temporary_password();
             if self.validate_one_password(password.clone()) {