diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index 64bd9b51..e6e91826 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -12,10 +12,12 @@ ESX.RegisterCommand('setjob', 'admin', function(xPlayer, args, showError)
 	else
 		showError(TranslateCap('command_setjob_invalid'))
 	end
+	
 	ESX.DiscordLogFields("UserActions", "/setjob Triggered", "pink", {
-		{name = "Player", value = xPlayer.name, inline = true},
+		{name = "Executor", value = xPlayer and xPlayer.name or 'Console', inline = true},
+		{name = "Target", value = args.playerId.name, inline = true}, 
 		{name = "Job", value = args.job, inline = true},
-    {name = "Grade", value = args.grade, inline = true}
+        {name = "Grade", value = args.grade, inline = true}
 	})
 end, true, {help = TranslateCap('command_setjob'), validate = true, arguments = {
 	{name = 'playerId', help = TranslateCap('commandgeneric_playerid'), type = 'player'},