diff --git a/src/api/client_server/account.rs b/src/api/client_server/account.rs
index 7c288b6e..5ae2b566 100644
--- a/src/api/client_server/account.rs
+++ b/src/api/client_server/account.rs
@@ -293,6 +293,7 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
             }
         }
 
+        let _user_id = user_id.clone();
         let default_rooms = services().globals.default_rooms().await?;
         let servers: Vec<_> = default_rooms
             .iter()
@@ -301,19 +302,21 @@ pub async fn register_route(body: Ruma<register::v3::Request>) -> Result<registe
             .map(Into::into)
             .collect();
 
-        for room_id in default_rooms {
-            if let Err(e) = join_room_by_id_helper(
-                Some(&user_id),
-                room_id,
-                Some("All men are equal before fish.".to_owned()),
-                &servers,
-                None,
-            )
-            .await
-            {
-                warn!("Failed to join default room: {}", e);
+        tokio::spawn(async move {
+            for room_id in default_rooms {
+                if let Err(e) = join_room_by_id_helper(
+                    Some(&_user_id),
+                    room_id,
+                    Some("All men are equal before fish.".to_owned()),
+                    &servers,
+                    None,
+                )
+                .await
+                {
+                    warn!("Failed to join default room: {}", e);
+                }
             }
-        }
+        });
     }
 
     Ok(register::v3::Response {
diff --git a/src/service/globals/mod.rs b/src/service/globals/mod.rs
index 87215be6..e1ee109c 100644
--- a/src/service/globals/mod.rs
+++ b/src/service/globals/mod.rs
@@ -10,7 +10,7 @@ use tokio::sync::OnceCell;
 use crate::api::server_server::DestinationResponse;
 
 use crate::{services, Config, Error, Result};
-use futures_util::{FutureExt, TryFutureExt};
+use futures_util::FutureExt;
 use hickory_resolver::TokioAsyncResolver;
 use hyper_util::client::legacy::connect::dns::{GaiResolver, Name as HyperName};
 use reqwest::dns::{Addrs, Name, Resolve, Resolving};
@@ -519,7 +519,7 @@ impl Service {
         for mut alias_or_id in self.config.default_rooms.iter().cloned() {
             // anything that does not start '!' should be considered an alias
             // empty strings are ignored
-            let room_id = if Some('!') == alias_or_id.chars().next() {
+            let room_id = if alias_or_id.starts_with('!') {
                 if alias_or_id.split_once(':').is_none() {
                     alias_or_id = format!("{}:{}", alias_or_id, self.config.server_name);
                 }
@@ -546,7 +546,7 @@ impl Service {
                     Error::bad_config("Invalid room alias for join-by-default rooms.")
                 })?;
 
-                if room_alias.server_name() == &self.config.server_name {
+                if room_alias.server_name() == self.config.server_name {
                     services()
                         .rooms
                         .alias