diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 8618e10e..b382d77a 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -168,11 +168,6 @@ public class NPC extends AbstractCharacter {
 
             this.name = rs.getString("npc_name");
 
-            // Name override for npc
-
-            if (wordCount(this.name) < 2 && this.contract != null)
-                this.name += " the " + this.contract.getName();
-
         } catch (Exception e) {
             Logger.error("NPC: " + this.dbID + " :" + e);
             e.printStackTrace();
@@ -1047,6 +1042,11 @@ public class NPC extends AbstractCharacter {
         if (this.contract == null)
             return; // Early exit for npc guild owners
 
+        // Name override for this npc
+
+        if (wordCount(this.name) < 2 && this.contract != null)
+            this.name += " the " + this.contract.getName();
+
         // Configure parent zone adding this NPC to the
         // zone collection