diff --git a/src/engine/gameManager/ForgeManager.java b/src/engine/gameManager/ForgeManager.java
index b500535e..a4c251e4 100644
--- a/src/engine/gameManager/ForgeManager.java
+++ b/src/engine/gameManager/ForgeManager.java
@@ -270,9 +270,13 @@ public enum ForgeManager implements Runnable {
 
         if (workOrder.prefixToken == 0)
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
+        else
+            forgedItem.prefixToken = workOrder.prefixToken;
 
         if (workOrder.suffixToken == 0)
             forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
+        else
+            forgedItem.suffixToken = workOrder.suffixToken;
 
         // Forged random rolled items are unidentified until completed