diff --git a/client/main.lua b/client/main.lua
index f9a8e4df..9a033169 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -49,4 +49,4 @@ end, false)
 RegisterKeyMapping('showbills', _U('keymap_showbills'), 'keyboard', 'F7')
 
 AddEventHandler('esx:onPlayerDeath', function() isDead = true end)
-AddEventHandler('playerSpawned', function(spawn) isDead = false end)
+AddEventHandler('esx:onPlayerSpawn', function(spawn) isDead = false end)
diff --git a/esx_billing.sql b/esx_billing.sql
index b57c4838..d5dec7a2 100644
--- a/esx_billing.sql
+++ b/esx_billing.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 CREATE TABLE `billing` (
 	`id` int(11) NOT NULL AUTO_INCREMENT,