diff --git a/splunk/game-logic/game_manager.gd b/splunk/game-logic/game_manager.gd
index 924be52..d0c41ba 100644
--- a/splunk/game-logic/game_manager.gd
+++ b/splunk/game-logic/game_manager.gd
@@ -22,9 +22,10 @@ func _input(event: InputEvent) -> void:
 
 
 @rpc("any_peer", "call_local", "reliable")
-func request_server_to_spawn_player(peer_id: int) -> void:
+func request_server_to_spawn_player(peer_id: int, player_name: String) -> void:
 	var data: Dictionary = {}
 	
 	data["peer_id"] = peer_id
+	data["player_name"] = player_name
 	
 	player_spawner.spawn(data)
diff --git a/splunk/networking/player_spawner.gd b/splunk/networking/player_spawner.gd
index a549db8..be96167 100644
--- a/splunk/networking/player_spawner.gd
+++ b/splunk/networking/player_spawner.gd
@@ -11,12 +11,13 @@ func spawn_player(data: Dictionary) -> Player:
 	var new_player = player_scene.instantiate() as Player
 	
 	var peer_id = str(data["peer_id"])
+	var player_name = str(data["player_name"])
 	
 	new_player.set_multiplayer_authority(int(peer_id), true)
-	new_player.set_player_name(peer_id)
+	new_player.set_player_name(peer_id, player_name)
 	new_player.position = Vector3.UP
 	
-	GameManager.players.append(peer_id)
+	GameManager.players.append(int(peer_id))
 	
 	return new_player
 	
diff --git a/splunk/networking/steam-manager.gd b/splunk/networking/steam-manager.gd
index 34e177f..cd5c990 100644
--- a/splunk/networking/steam-manager.gd
+++ b/splunk/networking/steam-manager.gd
@@ -64,7 +64,7 @@ func _on_lobby_created(connect: int, this_lobby_id: int):
 	print("[HOST] 3. Multiplayer host started (My Peer ID is always 1).")
 	
 	#players.append(peer.get)
-	GameManager.request_server_to_spawn_player.rpc_id(1, 1)
+	GameManager.request_server_to_spawn_player.rpc_id(1, 1, steam_username)
 
 
 func join_lobby(this_lobby_id: int):
@@ -88,7 +88,7 @@ func _on_lobby_joined(this_lobby_id: int, _p, _l, response: int):
 func _on_connected_to_server():
 	print("[CLIENT] 4. Successfully connected to host's multiplayer peer.")
 	print("[CLIENT] 5. Sending my info to the server for registration...")
-	GameManager.request_server_to_spawn_player.rpc_id(1, multiplayer.get_unique_id())
+	GameManager.request_server_to_spawn_player.rpc_id(1, multiplayer.get_unique_id(), steam_username)
 
 
 func _on_p2p_session_request(steam_id_remote: int) -> void:
diff --git a/splunk/player/player.gd b/splunk/player/player.gd
index 104bf13..d0cca40 100644
--- a/splunk/player/player.gd
+++ b/splunk/player/player.gd
@@ -21,9 +21,9 @@ func _ready():
 		$Mesh.hide()
 
 
-func set_player_name(player_name: String):
-	name = player_name
-	$Label3D.text = SteamManager.steam_username
+func set_player_name(peer_id: String, player_name: String):
+	name = peer_id
+	$Label3D.text = player_name
 
 
 #@rpc("any_peer", "call_local", "unreliable")