diff --git a/src/server/connection.rs b/src/server/connection.rs
index b2e198681..898939b62 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -126,6 +126,7 @@ pub struct Connection {
     origin_resolution: HashMap<String, Resolution>,
     voice_call_request_timestamp: Option<NonZeroI64>,
     audio_input_device_before_voice_call: Option<String>,
+    options_in_login: Option<OptionMessage>,
 }
 
 impl ConnInner {
@@ -233,6 +234,7 @@ impl Connection {
             audio_sender: None,
             voice_call_request_timestamp: None,
             audio_input_device_before_voice_call: None,
+            options_in_login: None,
         };
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
         tokio::spawn(async move {
@@ -921,6 +923,9 @@ impl Connection {
         let mut msg_out = Message::new();
         msg_out.set_login_response(res);
         self.send(msg_out).await;
+        if let Some(o) = self.options_in_login.take() {
+            self.update_options(&o).await;
+        }
         if let Some((dir, show_hidden)) = self.file_transfer.clone() {
             let dir = if !dir.is_empty() && std::path::Path::new(&dir).is_dir() {
                 &dir
@@ -1106,8 +1111,7 @@ impl Connection {
     async fn handle_login_request_without_validation(&mut self, lr: &LoginRequest) {
         self.lr = lr.clone();
         if let Some(o) = lr.option.as_ref() {
-            // It may not be a good practice to update all options here.
-            self.update_options(o).await;
+            self.options_in_login = Some(o.clone());
             if let Some(q) = o.video_codec_state.clone().take() {
                 scrap::codec::Encoder::update_video_encoder(
                     self.inner.id(),
@@ -1697,7 +1701,8 @@ impl Connection {
         self.send_to_cm(Data::CloseVoiceCall("".to_owned()));
     }
 
-    async fn update_options_without_auth(&mut self, o: &OptionMessage) {
+    async fn update_options(&mut self, o: &OptionMessage) {
+        log::info!("Option update: {:?}", o);
         if let Ok(q) = o.image_quality.enum_value() {
             let image_quality;
             if let ImageQuality::NotSet = q {
@@ -1728,12 +1733,6 @@ impl Connection {
                 scrap::codec::EncoderUpdate::State(q),
             );
         }
-    }
-
-    async fn update_options_with_auth(&mut self, o: &OptionMessage) {
-        if !self.authorized {
-            return;
-        }
         if let Ok(q) = o.lock_after_session_end.enum_value() {
             if q != BoolOption::NotSet {
                 self.lock_after_session_end = q == BoolOption::Yes;
@@ -1862,12 +1861,6 @@ impl Connection {
         }
     }
 
-    async fn update_options(&mut self, o: &OptionMessage) {
-        log::info!("Option update: {:?}", o);
-        self.update_options_without_auth(o).await;
-        self.update_options_with_auth(o).await;
-    }
-
     async fn on_close(&mut self, reason: &str, lock: bool) {
         log::info!("#{} Connection closed: {}", self.inner.id(), reason);
         if lock && self.lock_after_session_end && self.keyboard {