diff --git a/client/main.lua b/client/main.lua
index b2f522b3..3b0edf2b 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -11,10 +11,10 @@ AddEventHandler('esx_rpchat:sendProximityMessage', function(id, title, message,
 end)
 
 Citizen.CreateThread(function()
-	TriggerEvent('chat:addSuggestion', '/ooc',  _U('ooc_help'),  {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}})
-	TriggerEvent('chat:addSuggestion', '/twt',  _U('twt_help'),  {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}})
-	TriggerEvent('chat:addSuggestion', '/me',   _U('me_help'),   {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}})
-	TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), {{name=_U('ooc_argument_name'), help=_U('ooc_argument_help')}})
+	TriggerEvent('chat:addSuggestion', '/ooc',  _U('ooc_help'),  { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } )
+	TriggerEvent('chat:addSuggestion', '/twt',  _U('twt_help'),  { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } )
+	TriggerEvent('chat:addSuggestion', '/me',   _U('me_help'),   { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } )
+	TriggerEvent('chat:addSuggestion', '/news', _U('news_help'), { { name = _U('ooc_argument_name'), help = _U('ooc_argument_help') } } )
 end)
 
 AddEventHandler('onResourceStop', function(resource)
diff --git a/server/main.lua b/server/main.lua
index 4a95a442..d720ca20 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -2,7 +2,7 @@ AddEventHandler('chatMessage', function(source, author, message)
 
 	if string.sub(message, 1, 1) == "/" then
 		CancelEvent()
-		TriggerClientEvent('chat:addMessage', -1, { args = { '^1SYSTEM', _U('ooc_unknown_command', message) } })
+		TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', _U('ooc_unknown_command', message) } })
 	end
 
 end)