diff --git a/src/protocol/swg/objectControllerObjects/ShowQuestAcceptWindow.java b/src/protocol/swg/objectControllerObjects/ShowQuestAcceptWindow.java
index 067f5898..125155a4 100644
--- a/src/protocol/swg/objectControllerObjects/ShowQuestAcceptWindow.java
+++ b/src/protocol/swg/objectControllerObjects/ShowQuestAcceptWindow.java
@@ -49,7 +49,7 @@ public class ShowQuestAcceptWindow extends ObjControllerObject {
 		buffer.putLong(objectId);
 		buffer.putInt(0);
 		
-		buffer.putInt(CRC.StringtoCRC("quest/" + questName));
+		buffer.putInt(CRC.StringtoCRC(questName));
 		
 		return buffer.flip();
 	}
diff --git a/src/protocol/swg/objectControllerObjects/ShowQuestCompletionWindow.java b/src/protocol/swg/objectControllerObjects/ShowQuestCompletionWindow.java
index cc8be977..4a5070b5 100644
--- a/src/protocol/swg/objectControllerObjects/ShowQuestCompletionWindow.java
+++ b/src/protocol/swg/objectControllerObjects/ShowQuestCompletionWindow.java
@@ -49,7 +49,7 @@ public class ShowQuestCompletionWindow extends ObjControllerObject {
 		buffer.putLong(objectId);
 		buffer.putInt(0);
 		
-		buffer.putInt(CRC.StringtoCRC("quest/" + questName));
+		buffer.putInt(CRC.StringtoCRC(questName));
 		
 		return buffer.flip();
 	}
diff --git a/src/services/quest/QuestService.java b/src/services/quest/QuestService.java
index 27a79aab..73743f74 100644
--- a/src/services/quest/QuestService.java
+++ b/src/services/quest/QuestService.java
@@ -269,7 +269,7 @@ public class QuestService implements INetworkDispatch {
 			
 			// TODO: Unable to determine if this is calculated in "Complete Quest" window should pop up or just finish automatically, but it's the best for now
 			if (task.isVisible())
-				sendQuestCompleteWindow(quester, quest.getName());
+				sendQuestCompleteWindow(quester, quest.getCrcName());
 			else
 				completeQuest(player, quest);