diff --git a/src/api/client/membership/join.rs b/src/api/client/membership/join.rs
index f044529d..a249be09 100644
--- a/src/api/client/membership/join.rs
+++ b/src/api/client/membership/join.rs
@@ -346,7 +346,7 @@ pub async fn join_room_by_id_helper(
 		{
 			warn!("Antispam prevented user {} from joining room {}: {}", sender_user, room_id, e);
 			return Err!(Request(Forbidden("Antispam rejected join request.")));
-		};
+		}
 	}
 
 	if server_in_room {
@@ -786,7 +786,7 @@ async fn join_room_by_id_helper_local(
 			}
 		},
 		| _ => {},
-	};
+	}
 	let join_authorized_via_users_server = if restricted_join_authorized.is_none() {
 		None
 	} else {
@@ -848,7 +848,7 @@ async fn join_room_by_id_helper_local(
 
 	warn!(
 		?error,
-		remote_servers = %servers.len()-1,
+		servers = %servers.len(),
 		"Could not join restricted room locally, attempting remote join",
 	);
 	let Ok((make_join_response, remote_server)) =
diff --git a/src/api/server/make_join.rs b/src/api/server/make_join.rs
index 2dc205c4..956af53b 100644
--- a/src/api/server/make_join.rs
+++ b/src/api/server/make_join.rs
@@ -123,10 +123,11 @@ pub(crate) async fn create_join_event_template_route(
 		}
 	};
 	if services.antispam.check_all_joins() && join_authorized_via_users_server.is_none() {
-		if let Err(_) = services
+		if services
 			.antispam
 			.meowlnir_accept_make_join(body.room_id.clone(), body.user_id.clone())
 			.await
+			.is_err()
 		{
 			return Err!(Request(Forbidden("Antispam rejected join request.")));
 		}