diff --git a/client/events.lua b/client/events.lua
index bf60e7d..aa31e2f 100644
--- a/client/events.lua
+++ b/client/events.lua
@@ -17,13 +17,11 @@ end
 
 -- Sets main character.
 RegisterNetEvent("ND:characterLoaded", function(character)
-    if not NDCore.player then return end
     NDCore.player = removeCharacterFunctions(character)
 end)
 
 -- Update main character info.
 RegisterNetEvent("ND:updateCharacter", function(character)
-    if not NDCore.player then return end
     NDCore.player = removeCharacterFunctions(character)
 end)
 
diff --git a/client/main.lua b/client/main.lua
index fbe254a..5428b2f 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -26,7 +26,7 @@ CreateThread(function()
     local presenceText = ("Playing: %s"):format(Config.serverName)
     while true do
         if NDCore.player then
-            local presence = ("Playing: %s as % %"):format(Config.serverName, NDCore.player.firstname, NDCore.player.lastname)
+            local presence = ("Playing: %s as %s %s"):format(Config.serverName, NDCore.player.firstname, NDCore.player.lastname)
             local presenceTextSmall = ("Playing as: %s %s"):format(NDCore.player.firstname, NDCore.player.lastname)
             SetRichPresence(presence)
             SetDiscordRichPresenceAssetText(presenceText)