diff --git a/client/main.lua b/client/main.lua
index 46759861..7e8d71e9 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -122,13 +122,8 @@ function OpenShopMenu(accessory)
 	end, restrict)
 end
 
-AddEventHandler('playerSpawned', function()
-	isDead = false
-end)
-
-AddEventHandler('esx:onPlayerDeath', function()
-	isDead = true
-end)
+AddEventHandler('esx:onPlayerSpawn', function() isDead = false end)
+AddEventHandler('esx:onPlayerDeath', function() isDead = true end)
 
 AddEventHandler('esx_accessories:hasEnteredMarker', function(zone)
 	CurrentAction     = 'shop_menu'
diff --git a/esx_accessories.sql b/esx_accessories.sql
index d10b2e1b..01567e98 100644
--- a/esx_accessories.sql
+++ b/esx_accessories.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
 	('user_ears', 'Ears', 0),
diff --git a/localization/cs_esx_accessories.sql b/localization/cs_esx_accessories.sql
index d3319986..33d99a31 100644
--- a/localization/cs_esx_accessories.sql
+++ b/localization/cs_esx_accessories.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
 	('user_ears', 'Usi', 0),
diff --git a/localization/fi_esx_accessories.sql b/localization/fi_esx_accessories.sql
index 81defba5..6a145374 100644
--- a/localization/fi_esx_accessories.sql
+++ b/localization/fi_esx_accessories.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
 	('user_ears', 'Örontilbb', 0),
diff --git a/localization/ru_esx_accessories.sql b/localization/ru_esx_accessories.sql
index cd2139f5..106d4ff1 100644
--- a/localization/ru_esx_accessories.sql
+++ b/localization/ru_esx_accessories.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
 	('user_ears', 'Аксессуары для ушей', 0),
diff --git a/localization/sv_esx_accessories.sql b/localization/sv_esx_accessories.sql
index b947b632..245e0028 100644
--- a/localization/sv_esx_accessories.sql
+++ b/localization/sv_esx_accessories.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
 	('user_ears', 'Örontillbehör', 0),