diff --git a/[core]/es_extended/client/main.lua b/[core]/es_extended/client/main.lua
index 7cc84fc9..15d2c70b 100644
--- a/[core]/es_extended/client/main.lua
+++ b/[core]/es_extended/client/main.lua
@@ -664,6 +664,16 @@ AddEventHandler("esx:killPlayer", function()
 	SetEntityHealth(ESX.PlayerData.ped, 0)
 end)
 
+RegisterNetEvent("esx:repairPedVehicle")
+AddEventHandler("esx:repairPedVehicle", function()
+	local ped = ESX.PlayerData.ped
+	local vehicle = GetVehiclePedIsIn(ped, false)
+	SetVehicleEngineHealth(vehicle, 1000)
+	SetVehicleEngineOn(vehicle, true, true)
+	SetVehicleFixed(vehicle)
+	SetVehicleDirtLevel(vehicle, 0)
+end)
+
 RegisterNetEvent("esx:freezePlayer")
 AddEventHandler("esx:freezePlayer", function(input)
 	local player = PlayerId()
diff --git a/[core]/es_extended/locales/cs.lua b/[core]/es_extended/locales/cs.lua
index 4a7a224f..e658fc61 100644
--- a/[core]/es_extended/locales/cs.lua
+++ b/[core]/es_extended/locales/cs.lua
@@ -52,6 +52,7 @@ Locales["cs"] = {
 
 	["act_imp"] = "Nelze provést",
 	["in_vehicle"] = "Nelze provést, hráč je v autě",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'Přivolat si hráče k sobě',
@@ -59,6 +60,9 @@ Locales["cs"] = {
 	['command_car_car'] = 'Zadej jméno vozidla nebo spawnname',
 	['command_cardel'] = 'Odstranění vozidla v okolí',
 	['command_cardel_radius'] = 'Odstranění vozidla v určeném dosahu',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Vymazat text v chatu',
 	['command_clearall'] = 'Vymazat chet pro všechny hráče',
 	['command_clearinventory'] = 'Vymazat všechny věci z invetáře hráče',
diff --git a/[core]/es_extended/locales/da.lua b/[core]/es_extended/locales/da.lua
index 0f700323..2aff7e81 100644
--- a/[core]/es_extended/locales/da.lua
+++ b/[core]/es_extended/locales/da.lua
@@ -52,6 +52,7 @@ Locales["da"] = {
 
 	["act_imp"] = "Kan ikke udføre handling",
 	["in_vehicle"] = "Kan ikke udføre handling, spilleren er i et køretøj",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'Tag en spiller til dig',
@@ -59,6 +60,9 @@ Locales["da"] = {
 	['command_car_car'] = 'Køretøjsmodel eller hash',
 	['command_cardel'] = 'Fjern køretøjer i nærheden',
 	['command_cardel_radius'] = 'Fjerner alle køretøjer inden for den specificerede radius',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Ryd chatten',
 	['command_clearall'] = 'Ryd chatten for alle spillere',
 	['command_clearinventory'] = 'Fjern alle elementer fra spillernes inventar',
diff --git a/[core]/es_extended/locales/de.lua b/[core]/es_extended/locales/de.lua
index 97d511b2..5b5f377b 100644
--- a/[core]/es_extended/locales/de.lua
+++ b/[core]/es_extended/locales/de.lua
@@ -52,6 +52,7 @@ Locales["de"] = {
 
 	["act_imp"] = "Du kannst diese Aktion nicht ausführen!",
 	["in_vehicle"] = "Du kannst diese Aktion nicht ausführen! Person ist in einem Fahrzeug",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'Person zu dir bringen',
@@ -59,6 +60,9 @@ Locales["de"] = {
 	['command_car_car'] = 'Fahrzeug Model oder Hash',
 	['command_cardel'] = 'Fahrzeuge entfernen',
 	['command_cardel_radius'] = 'Entfernt alle Fahrzeuge in einem bestimmten Radius',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Textchat leeren',
 	['command_clearall'] = 'Textchat leeren für alle Spieler leeren',
 	['command_clearinventory'] = 'Alle Items von dem Inventar eines Spielers entfernen',
diff --git a/[core]/es_extended/locales/en.lua b/[core]/es_extended/locales/en.lua
index edae8952..8aba2ea1 100644
--- a/[core]/es_extended/locales/en.lua
+++ b/[core]/es_extended/locales/en.lua
@@ -52,6 +52,7 @@ Locales["en"] = {
 
   ["act_imp"] = "Cannot Perform Action",
   ["in_vehicle"] = "Cannot Perform Action, Player is in a vehicle",
+  ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
   -- Commands
   ['command_bring'] = 'Bring player to you',
@@ -59,6 +60,9 @@ Locales["en"] = {
   ['command_car_car'] = 'Vehicle model or hash',
   ['command_cardel'] = 'Remove vehicles in proximity',
   ['command_cardel_radius'] = 'Removes all vehicles within the specified radius',
+  ['command_repair'] = 'Repair your vehicle',
+  ['command_repair_success'] = 'Successfully repaired vehicle',
+  ['command_repair_success_target'] = 'An admin repaired your vehicle',
   ['command_clear'] = 'Clear chat Text',
   ['command_clearall'] = 'Clear chat Text for all players',
   ['command_clearinventory'] = 'Remove All items from the Players Inventory',
diff --git a/[core]/es_extended/locales/es.lua b/[core]/es_extended/locales/es.lua
index d72ab4f8..7fd9438b 100644
--- a/[core]/es_extended/locales/es.lua
+++ b/[core]/es_extended/locales/es.lua
@@ -52,6 +52,7 @@ Locales["es"] = {
 
 	["act_imp"] = "No se pudo realizar la acción.",
 	["in_vehicle"] = "Acción rechazada. El jugador se encuentra en un vehículo",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'Traer un jugador hacia ti',
@@ -59,6 +60,9 @@ Locales["es"] = {
 	['command_car_car'] = 'Nombre del vehículo',
 	['command_cardel'] = 'Eliminar vehículos cercanos',
 	['command_cardel_radius'] = 'Opcional, eliminar todos los vehículos en el radio especificado',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Limpiar chat para ti',
 	['command_clearall'] = 'Limpiar chat para todos los jugadores',
 	['command_clearinventory'] = 'Limpiar el inventario del jugador',
diff --git a/[core]/es_extended/locales/fi.lua b/[core]/es_extended/locales/fi.lua
index 89a47ad5..bd32d952 100644
--- a/[core]/es_extended/locales/fi.lua
+++ b/[core]/es_extended/locales/fi.lua
@@ -52,12 +52,16 @@ Locales["fi"] = {
 
 	["act_imp"] = "Toiminto mahdoton",
 	["in_vehicle"] = "Et voi antaa ajoneuvossa olevalle mitään",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_car'] = 'Luo ajoneuvo',
 	['command_car_car'] = 'Ajoneuvon nimi tai hash',
 	['command_cardel'] = 'Poistaa ajoneuvon läheltä',
 	['command_cardel_radius'] = 'Valinnainen, poista kaikki ajoneuvot määritetyllä säteellä',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Tyhjennä keskustelu',
 	['command_clearall'] = 'Tyhjennä keskustelu kaikilta pelaajilta',
 	['command_clearinventory'] = 'Tyhjennä pelaajan reppu',
diff --git a/[core]/es_extended/locales/fr.lua b/[core]/es_extended/locales/fr.lua
index 71f1e899..915ab91f 100644
--- a/[core]/es_extended/locales/fr.lua
+++ b/[core]/es_extended/locales/fr.lua
@@ -52,6 +52,7 @@ Locales["fr"] = {
 
 	["act_imp"] = "Action impossible",
 	["in_vehicle"] = "Action impossible, le joueur est dans un véhicule",
+	["not_in_vehicle"] = "Action impossible, le joueur n'est pas dans un véhicule",
 
 	-- Commands
 	["command_bring"] = "Téléporter un joueur sur vous",
@@ -59,6 +60,9 @@ Locales["fr"] = {
 	["command_car_car"] = "Nom ou hash du véhicule",
 	["command_cardel"] = "Supprimer les véhicules à proximité",
 	["command_cardel_radius"] = "Supprime tous les véhicules dans un rayon spécifié",
+	["command_repair"] = "Réparer votre véhicule",
+	["command_repair_success"] = "Véhicule réparé avec succès",
+	["command_repair_success_target"] = "Votre véhicule a été réparé par un membre du staff",
 	["command_clear"] = "Effacer le chat",
 	["command_clearall"] = "Effacer le chat de tous les joueurs",
 	["command_clearinventory"] = "Retirer tous les objets de l'inventaire du joueur",
diff --git a/[core]/es_extended/locales/hu.lua b/[core]/es_extended/locales/hu.lua
index 108b0f42..02feb4ed 100644
--- a/[core]/es_extended/locales/hu.lua
+++ b/[core]/es_extended/locales/hu.lua
@@ -52,6 +52,7 @@ Locales["hu"] = {
 
 	["act_imp"] = "Érvénytelen mennyiség",
 	["in_vehicle"] = "Nem tudod átadni, mivel benne ül a jármüben",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	["command_bring"] = "Játékos magadhoz teleportálása",
@@ -59,6 +60,9 @@ Locales["hu"] = {
 	["command_car_car"] = "Jármű név vagy hash",
 	["command_cardel"] = "Közeli járművek törlése",
 	["command_cardel_radius"] = "Megadott radiusban lévő járművek törlése",
+	["command_repair"] = "Repair your vehicle",
+	["command_repair_success"] = "Successfully repaired vehicle",
+	["command_repair_success_target"] = "An admin repaired your vehicle",
 	["command_clear"] = "Chat ürítése",
 	["command_clearall"] = "Chat ürítése minden játékosnál",
 	["command_clearinventory"] = "Minden tárgy törlése a játékos inventoryból",
diff --git a/[core]/es_extended/locales/it.lua b/[core]/es_extended/locales/it.lua
index cccf5ecb..47c976a6 100644
--- a/[core]/es_extended/locales/it.lua
+++ b/[core]/es_extended/locales/it.lua
@@ -52,6 +52,7 @@ Locales["it"] = {
 
 	["act_imp"] = "Non puoi farlo",
 	["in_vehicle"] = "Non puoi farlo, il giocatore è in un veicolo",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'Porta il giocatore da te',
@@ -59,6 +60,9 @@ Locales["it"] = {
 	['command_car_car'] = 'Modello o hash veicolo',
 	['command_cardel'] = 'Rimuovi i veicoli nelle prossimità',
 	['command_cardel_radius'] = 'Rimuovi i veicoli nel raggio specificato',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Pulisci la chat testuale',
 	['command_clearall'] = 'Pulisci la chat testuale per tutti i giocatori',
 	['command_clearinventory'] = 'Rimuovi tutti gli oggetti dall\' inventario del giocatore',
diff --git a/[core]/es_extended/locales/nl.lua b/[core]/es_extended/locales/nl.lua
index 92be5425..7cfdfaf3 100644
--- a/[core]/es_extended/locales/nl.lua
+++ b/[core]/es_extended/locales/nl.lua
@@ -52,6 +52,7 @@ Locales["nl"] = {
 
     ["act_imp"] = "Kan actie niet uitvoeren",
     ["in_vehicle"] = "Kan actie niet uitvoeren, de speler zit in een voertuig.",
+    ["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
     -- Commands
     ['command_bring'] = 'Breng speler naar jou',
@@ -59,6 +60,9 @@ Locales["nl"] = {
     ['command_car_car'] = 'Voertuig model of hash',
     ['command_cardel'] = 'Verwijder voertuigen in straal',
     ['command_cardel_radius'] = 'Verwijderd alle voertuigen in gewenste straal',
+    ['command_repair'] = 'Repair your vehicle',
+    ['command_repair_success'] = 'Successfully repaired vehicle',
+    ['command_repair_success_target'] = 'An admin repaired your vehicle',
     ['command_clear'] = 'Verwijder chat berichten',
     ['command_clearall'] = 'Verwijder chat berichten voor alle spelers',
     ['command_clearinventory'] = 'Verwijder alle items van een speler zijn inventory',
diff --git a/[core]/es_extended/locales/pl.lua b/[core]/es_extended/locales/pl.lua
index c2379115..d738239a 100644
--- a/[core]/es_extended/locales/pl.lua
+++ b/[core]/es_extended/locales/pl.lua
@@ -51,12 +51,16 @@ Locales["pl"] = {
 	["account_money"] = "pieniądze",
 	["act_imp"] = "działanie niemożliwe",
 	["in_vehicle"] = "nie możesz przekazywać przedmiotów w pojeździe",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_car'] = 'przywołaj pojazd',
 	['command_car_car'] = 'nazwa lub hash przywołanego pojazdu',
 	['command_cardel'] = 'usuń pojazd w pobliżu',
 	['command_cardel_radius'] = 'opcjonalnie usuń każdy pojazd w obszarze',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'wyczyść czat',
 	['command_clearall'] = 'wyczyść czat dla wszystkich graczy',
 	['command_clearinventory'] = 'wyczyść ekwipunek gracza',
diff --git a/[core]/es_extended/locales/sl.lua b/[core]/es_extended/locales/sl.lua
index 4accdb0c..0fe41be5 100644
--- a/[core]/es_extended/locales/sl.lua
+++ b/[core]/es_extended/locales/sl.lua
@@ -52,6 +52,7 @@ Locales["sl"] = {
 
 	["act_imp"] = "Dejanja ni mogoče izvesti",
 	["in_vehicle"] = "Dejanja ni mogoče izvesti, Oseba je v vozilu",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'Teleportiraj osebo do sebe',
@@ -59,6 +60,9 @@ Locales["sl"] = {
 	['command_car_car'] = 'Koda vozila',
 	['command_cardel'] = 'Odstranite vozila v bližini',
 	['command_cardel_radius'] = 'Odstrani vsa vozila v določenem radiju',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Odstrani vsa sporocila v CHATU',
 	['command_clearall'] = 'Počisti besedilo klepeta za vse igralce',
 	['command_clearinventory'] = 'Vzemi vse stvari iz osebove shrambe',
diff --git a/[core]/es_extended/locales/sr.lua b/[core]/es_extended/locales/sr.lua
index 851be6d7..2813b846 100644
--- a/[core]/es_extended/locales/sr.lua
+++ b/[core]/es_extended/locales/sr.lua
@@ -52,6 +52,7 @@ Locales["sr"] = {
 
 	["act_imp"] = "Ne možete izvršiti radnju",
 	["in_vehicle"] = "Ne možete uraditi to dok je igrač u vozilu",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = 'TP-ajte igrača do Vas',
@@ -59,6 +60,9 @@ Locales["sr"] = {
 	['command_car_car'] = 'Model ili hash vozila',
 	['command_cardel'] = 'Obrišite vozilo u blizini',
 	['command_cardel_radius'] = 'Obrišite sva vozila unutar navedenog radiusa',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = 'Obrišite chat',
 	['command_clearall'] = 'Obrišite chat za sve igrače',
 	['command_clearinventory'] = 'Obrišite sve stvari iz inventara igrača',
diff --git a/[core]/es_extended/locales/zh-cn.lua b/[core]/es_extended/locales/zh-cn.lua
index abd04e94..e5093c25 100644
--- a/[core]/es_extended/locales/zh-cn.lua
+++ b/[core]/es_extended/locales/zh-cn.lua
@@ -52,6 +52,7 @@ Locales["zh-cn"] = {
 
 	["act_imp"] = "操作失败",
 	["in_vehicle"] = "请离开当前载具",
+	["not_in_vehicle"] = "Cannot Perform Action, Player isn't in a vehicle",
 
 	-- Commands
 	['command_bring'] = '传送玩家到您身边',
@@ -59,6 +60,9 @@ Locales["zh-cn"] = {
 	['command_car_car'] = '生成载具的模型名称或哈希值',
 	['command_cardel'] = '删除附近载具',
 	['command_cardel_radius'] = '可选，删除指定半径内的所有载具',
+	['command_repair'] = 'Repair your vehicle',
+	['command_repair_success'] = 'Successfully repaired vehicle',
+	['command_repair_success_target'] = 'An admin repaired your vehicle',
 	['command_clear'] = '清除聊天记录',
 	['command_clearall'] = '清除所有玩家的聊天记录',
 	['command_clearinventory'] = '清除玩家库存',
diff --git a/[core]/es_extended/server/commands.lua b/[core]/es_extended/server/commands.lua
index 86c64b46..17a1dfcf 100644
--- a/[core]/es_extended/server/commands.lua
+++ b/[core]/es_extended/server/commands.lua
@@ -132,6 +132,34 @@ end, false, {
 	}
 })
 
+ESX.RegisterCommand({ 'fix', 'repair' }, 'admin', function(xPlayer, args, showError)
+    local xTarget = args.playerId
+	local ped = GetPlayerPed(xTarget.source)
+	local pedVehicle = GetVehiclePedIsIn(ped, false)
+	if not pedVehicle or GetPedInVehicleSeat(pedVehicle, -1) ~= ped then
+		showError(TranslateCap('not_in_vehicle'))
+		return
+	end
+	xTarget.triggerEvent("esx:repairPedVehicle")
+	xPlayer.showNotification(TranslateCap('command_repair_success'), true, false, 140)
+	if xPlayer.source ~= xTarget.source then
+		xTarget.showNotification(TranslateCap('command_repair_success_target'), true, false, 140)
+	end
+	if Config.AdminLogging then
+		ESX.DiscordLogFields("UserActions", "Fix Vehicle /fix Triggered!", "pink", {
+			{ name = "Player", value = xPlayer.name,   inline = true },
+			{ name = "ID",     value = xPlayer.source, inline = true },
+			{ name = "Target",  value = xTarget.name, inline = true },
+		})
+	end
+end, true, {
+	help = TranslateCap('command_repair'),
+	validate = false,
+	arguments = {
+		{ name = 'playerId', help = TranslateCap('commandgeneric_playerid'), type = 'player' }
+	}
+})
+
 ESX.RegisterCommand('setaccountmoney', 'admin', function(xPlayer, args, showError)
 	if not args.playerId.getAccount(args.account) then
 		return showError(TranslateCap('command_giveaccountmoney_invalid'))