diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java
index 941c07b8..119be892 100644
--- a/src/engine/net/client/msg/VendorDialogMsg.java
+++ b/src/engine/net/client/msg/VendorDialogMsg.java
@@ -631,6 +631,11 @@ public class VendorDialogMsg extends ClientNetMsg {
                 .getObjectUUID(), true);
         DispatchMessage.dispatchMsgToInterestArea(pc, arm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
 
+        if(pc.getCharItemManager() != null && pc.getCharItemManager().getGoldInventory() != null && pc.getCharItemManager().getGoldInventory().getNumOfItems() < 1000) {
+            pc.getCharItemManager().addGoldToInventory(1000, false);
+            pc.getCharItemManager().addItemToInventory(new MobLoot(pc, ItemBase.getItemBase(980066), 1, false).promoteToItem(pc));
+            pc.getCharItemManager().updateInventory();
+        }
 
     }
 
diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index 8a16740f..af37822a 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -3079,10 +3079,12 @@ public class PlayerCharacter extends AbstractCharacter {
                 DispatchMessage.dispatchMsgToInterestArea(this, upm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
                 checkGuildStatus();
 
-                //give gold for level up if level is under or equal to 20
-                int gold = (int)((100000 * (this.level - 10) / 55.0) / groupSize);
-                this.charItemManager.addGoldToInventory((int)(xp *0.1f),false);
-                this.charItemManager.updateInventory();
+                //give gold for level up if level is under or equal to 20 and over 10
+                if(this.level >= 10 && this.level < 20) {
+                    int gold = (int) ((100000 * (this.level - 10) / 55.0) / groupSize);
+                    this.charItemManager.addGoldToInventory(gold, false);
+                    this.charItemManager.updateInventory();
+                }
 
             } else {
 
@@ -4895,11 +4897,11 @@ public class PlayerCharacter extends AbstractCharacter {
                     while (this.level < 10) {
                         grantXP(Experience.getBaseExperience(this.level + 1) - this.exp);
                     }
-                    if(this.charItemManager != null && this.charItemManager.getGoldInventory() != null && this.charItemManager.getGoldInventory().getNumOfItems() < 1000) {
-                        this.getCharItemManager().addGoldToInventory(1000, false);
-                        this.getCharItemManager().addItemToInventory(new MobLoot(this, ItemBase.getItemBase(980066), 1, false).promoteToItem(this));
-                        this.getCharItemManager().updateInventory();
-                    }
+                    //if(this.charItemManager != null && this.charItemManager.getGoldInventory() != null && this.charItemManager.getGoldInventory().getNumOfItems() < 1000) {
+                    //    this.getCharItemManager().addGoldToInventory(1000, false);
+                    //    this.getCharItemManager().addItemToInventory(new MobLoot(this, ItemBase.getItemBase(980066), 1, false).promoteToItem(this));
+                    //    this.getCharItemManager().updateInventory();
+                    //}
                 }
 
                 if(this.isBoxed && !this.containsEffect(1672601862)) {