diff --git a/src/login/login_screen.rs b/src/login/login_screen.rs
index ca653e027..a8be17fed 100644
--- a/src/login/login_screen.rs
+++ b/src/login/login_screen.rs
@@ -358,6 +358,7 @@ impl MatchEvent for LoginScreen {
             password_input.toggle_is_password(cx);
             show_pw_button.set_visible(cx, !self.password_visible);
             hide_pw_button.set_visible(cx, self.password_visible);
+            password_input.set_key_focus(cx);
             self.redraw(cx);
         }
 
diff --git a/src/sliding_sync.rs b/src/sliding_sync.rs
index 88c9fce5f..ef2220f5a 100644
--- a/src/sliding_sync.rs
+++ b/src/sliding_sync.rs
@@ -2639,14 +2639,6 @@ async fn start_matrix_client_login_and_sync(rt: Handle) {
                                 log!("matrix worker task ended with error due to logout: {e:?}");
                             } else {
                                 error!("Error: matrix worker task ended:\n\t{e:?}");
-                                rooms_list::enqueue_rooms_list_update(RoomsListUpdate::Status {
-                                    status: e.to_string(),
-                                });
-                                enqueue_popup_notification(
-                                    format!("Rooms list update error: {e}"),
-                                    PopupKind::Error,
-                                    None,
-                                );
                             }
                         },
                         Err(e) => {