diff --git a/RenX.SetJoin/RenX_SetJoin.cpp b/RenX.SetJoin/RenX_SetJoin.cpp
index a0f2d5e..262dbf7 100644
--- a/RenX.SetJoin/RenX_SetJoin.cpp
+++ b/RenX.SetJoin/RenX_SetJoin.cpp
@@ -27,7 +27,7 @@ void RenX_SetJoinPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInf
 {
 	if (player->steamid != 0)
 	{
-		const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid));
+		const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, player->uuid);
 		if (setjoin.isEmpty() == false)
 			server->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr()));
 	}
@@ -45,7 +45,7 @@ void ViewJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player
 {
 	if (player->steamid != 0)
 	{
-		const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid));
+		const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, player->uuid);
 		if (setjoin.isEmpty() == false)
 			source->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr()));
 		else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: No setjoin found."));
@@ -75,7 +75,7 @@ void DelJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player,
 {
 	if (player->steamid != 0)
 	{
-		if (Jupiter::IRC::Client::Config->remove(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid)))
+		if (Jupiter::IRC::Client::Config->remove(configSection, player->uuid))
 			source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message has been removed.", player->name.size(), player->name.ptr()));
 		else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Setjoin not found."));
 	}
@@ -104,7 +104,7 @@ void SetJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player,
 	{
 		if (parameters.isEmpty() == false)
 		{
-			Jupiter::IRC::Client::Config->set(configSection, Jupiter::StringS::Format("0x%.16llX", player->steamid), parameters);
+			Jupiter::IRC::Client::Config->set(configSection, player->uuid, parameters);
 			Jupiter::IRC::Client::Config->sync();
 			source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message is now: %.*s", player->name.size(), player->name.ptr(), parameters.size(), parameters.ptr()));
 		}