diff --git a/assets/core/networking/network_test_ui.gd b/assets/core/networking/network_test_ui.gd
index fb859cb..79fc438 100644
--- a/assets/core/networking/network_test_ui.gd
+++ b/assets/core/networking/network_test_ui.gd
@@ -47,25 +47,23 @@ func _on_join_button_pressed() -> void:
 
 	
 func _on_user_joined_lobby(user_id: int, username: String) -> void:
-	if network_manager.lobby_members[1] == {"steam_id": user_id, "username": username}:
+	if network_manager.lobby_members.size() >= 2 and  network_manager.lobby_members[1] == {"steam_id": user_id, "username": username}:
 		user_box2.get_node("Username").text = username
 		user_box2.get_node("PFP").texture = load_avatar(user_id)
 		user_box2.visible = true
-	elif network_manager.lobby_members[2] == {"steam_id": user_id, "username": username}:
+	elif network_manager.lobby_members.size() >= 3 and network_manager.lobby_members[2] == {"steam_id": user_id, "username": username}:
 		user_box3.get_node("Username").text = username
 		user_box3.get_node("PFP").texture = load_avatar(user_id)
 		user_box3.visible = true
-	elif network_manager.lobby_members[3] == {"steam_id": user_id, "username": username}:
+	elif network_manager.lobby_members.size() >= 4 and  network_manager.lobby_members[3] == {"steam_id": user_id, "username": username}:
 		user_box4.get_node("Username").text = username
 		user_box4.get_node("PFP").texture = load_avatar(user_id)
 		user_box4.visible = true
 	else:
-		GameConsole.log_error("Lobby is full!")
-		
+		_on_user_joined_lobby(user_id, username)
 		
 func load_avatar(user_id: int) -> ImageTexture:
 	Steam.getPlayerAvatar(user_id)
-	
 	Steam.avatar_loaded.connect(
 		func(_user_id: int, avatar_size: int, avatar_buffer: PackedByteArray) -> void:
 			var avatar_image: Image = Image.create_from_data(avatar_size, avatar_size, false, Image.FORMAT_RGBA8, avatar_buffer)