diff --git a/src/client.rs b/src/client.rs
index 2d8e6be36..6a5db19e2 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -946,10 +946,6 @@ impl LoginConfigHandler {
             msg.lock_after_session_end = BoolOption::Yes.into();
             n += 1;
         }
-        if self.get_toggle_option("privacy-mode") {
-            msg.privacy_mode = BoolOption::Yes.into();
-            n += 1;
-        }
         if self.get_toggle_option("disable-audio") {
             msg.disable_audio = BoolOption::Yes.into();
             n += 1;
@@ -973,6 +969,23 @@ impl LoginConfigHandler {
         }
     }
 
+    pub fn get_option_message_after_login(&self) -> Option<OptionMessage> {
+        if self.is_port_forward || self.is_file_transfer {
+            return None;
+        }
+        let mut n = 0;
+        let mut msg = OptionMessage::new();
+        if self.get_toggle_option("privacy-mode") {
+            msg.privacy_mode = BoolOption::Yes.into();
+            n += 1;
+        }
+        if n > 0 {
+            Some(msg)
+        } else {
+            None
+        }
+    }
+
     fn get_image_quality_enum(&self, q: &str, ignore_default: bool) -> Option<ImageQuality> {
         if q == "low" {
             Some(ImageQuality::Low)
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 325b88b5f..f948f964a 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -2068,6 +2068,22 @@ impl Remote {
         true
     }
 
+    async fn send_opts_after_login(&self, peer: &mut Stream) {
+        if let Some(opts) = self
+        .handler
+        .lc
+        .read()
+        .unwrap()
+        .get_option_message_after_login()
+    {
+        let mut misc = Misc::new();
+        misc.set_option(opts);
+        let mut msg_out = Message::new();
+        msg_out.set_misc(misc);
+        allow_err!(peer.send(&msg_out).await);
+    }
+    }
+
     async fn handle_msg_from_peer(&mut self, data: &[u8], peer: &mut Stream) -> bool {
         if let Ok(msg_in) = Message::parse_from_bytes(&data) {
             match msg_in.union {
@@ -2076,6 +2092,7 @@ impl Remote {
                         self.first_frame = true;
                         self.handler.call2("closeSuccess", &make_args!());
                         self.handler.call("adaptSize", &make_args!());
+                        self.send_opts_after_login(peer).await;
                     }
                     let incomming_format = CodecFormat::from(&vf);
                     if self.video_format != incomming_format {