diff --git a/scripts/server/item.js b/scripts/server/item.js
index bc7e3bd6..6812f6b2 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -499,6 +499,10 @@ function playerUseItem(client, hotBarSlot) {
 
 	let itemIndex = getPlayerData(client).hotBarItems[hotBarSlot];
 
+	if(itemIndex == -1) {
+		return false;
+	}
+
 	switch(getItemTypeData(getItemData(itemIndex).itemTypeIndex).useType) {
 		case AG_ITEM_USETYPE_SKIN:
 			//let oldSkin = getPlayerSkin(client);
@@ -523,7 +527,15 @@ function playerUseItem(client, hotBarSlot) {
 			break;
 
 		case AG_ITEM_USETYPE_PHONE:
-			showPlayerPhoneGUI(client);
+			if(getItemData(itemIndex).value == 0) {
+				let phoneNumber = generateRandomPhoneNumber();
+				getItemData(itemIndex).value = phoneNumber;
+				messagePlayerAlert(client, `Your ${getItemName(itemIndex)} has been set up with number ${phoneNumber}`);
+			} else {
+				getItemData(itemIndex).enabled = !getItemData(itemIndex).enabled;
+				messagePlayerAlert(client, `You turned ${getBoolRedGreenInlineColour(getItemData(itemIndex).enabled)}${toUpperCase(getOnOffFromBool(getItemData(itemIndex).enabled))} [#FFFFFF]your phone in slot ${getPlayerData(client).activeHotBarSlot+1} [#AAAAAA](${getItemValueDisplayForItem(itemIndex)})`);
+			}
+			//showPlayerPhoneGUI(client);
 			cachePlayerHotBarItems(client);
 			break;
 
@@ -1180,12 +1192,11 @@ function saveItemToDatabase(itemId) {
 	let dbConnection = connectToDatabase();
 	if(dbConnection) {
 		if(tempItemData.databaseId == 0) {
-			let dbQueryString = `INSERT INTO item_main (item_server, item_type, item_owner_type, item_owner_id, item_value, item_amount, item_pos_x, item_pos_y, item_pos_z, item_int, item_vw) VALUE (${getServerId()}, ${tempItemData.itemType}, ${tempItemData.ownerType}, ${tempItemData.ownerId}, ${tempItemData.value}, ${tempItemData.amount}, ${tempItemData.position.x},${tempItemData.position.y}, ${tempItemData.position.z}, ${tempItemData.interior}, ${tempItemData.dimension})`;
-
+			let dbQueryString = `INSERT INTO item_main (item_server, item_type, item_owner_type, item_owner_id, item_value, item_amount, item_pos_x, item_pos_y, item_pos_z, item_int, item_vw, item_buy_price) VALUE (${getServerId()}, ${tempItemData.itemType}, ${tempItemData.ownerType}, ${tempItemData.ownerId}, ${tempItemData.value}, ${tempItemData.amount}, ${tempItemData.position.x},${tempItemData.position.y}, ${tempItemData.position.z}, ${tempItemData.interior}, ${tempItemData.dimension}, ${tempItemData.buyPrice})`;
 			queryDatabase(dbConnection, dbQueryString);
 			getServerData().items[itemId].databaseId = getDatabaseInsertId(dbConnection);
 		} else {
-			let dbQueryString = `UPDATE item_main SET item_server=${getServerId()}, item_type=${tempItemData.itemType}, item_owner_type=${tempItemData.ownerType}, item_owner_id=${tempItemData.ownerId}, item_value=${tempItemData.value}, item_amount=${tempItemData.amount}, item_pos_x=${tempItemData.position.x}, item_pos_y=${tempItemData.position.y}, item_pos_z=${tempItemData.position.z}, item_int=${tempItemData.interior}, item_vw=${tempItemData.dimension}`;
+			let dbQueryString = `UPDATE item_main SET item_server=${getServerId()}, item_type=${tempItemData.itemType}, item_owner_type=${tempItemData.ownerType}, item_owner_id=${tempItemData.ownerId}, item_value=${tempItemData.value}, item_amount=${tempItemData.amount}, item_pos_x=${tempItemData.position.x}, item_pos_y=${tempItemData.position.y}, item_pos_z=${tempItemData.position.z}, item_int=${tempItemData.interior}, item_vw=${tempItemData.dimension}, item_buy_price=${tempItemData.buyPrice} WHERE item_id=${tempItemData.databaseId}`;
 
 			queryDatabase(dbConnection, dbQueryString);
 		}