diff --git a/src/main/java/kamkeel/QuestCommand.java b/src/main/java/kamkeel/QuestCommand.java
index 2e51306aa..b21e590a0 100644
--- a/src/main/java/kamkeel/QuestCommand.java
+++ b/src/main/java/kamkeel/QuestCommand.java
@@ -59,7 +59,7 @@ public class QuestCommand extends CommandKamkeelBase {
 	        QuestData questdata = new QuestData(quest);
 	        playerdata.questData.activeQuests.put(questid, questdata);
             playerdata.savePlayerDataOnFile();
-            if(playerdata.player != null){
+            if(playerdata.player != null && questdata.sendAlerts){
                 Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
                 Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
             }
diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
index a24e981bf..5a8024c64 100644
--- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
+++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
@@ -60,17 +60,24 @@ public class PlayerQuestController {
 	public static void setQuestFinished(Quest quest, EntityPlayer player){
 		PlayerData playerdata = PlayerDataController.instance.getPlayerData(player);
 		PlayerQuestData data = playerdata.questData;
+		QuestData questData = data.activeQuests.get(quest.id);
 		data.activeQuests.remove(quest.id);
 		if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY)
 			data.finishedQuests.put(quest.id, System.currentTimeMillis());
 		else
 			data.finishedQuests.put(quest.id,player.worldObj.getTotalWorldTime());
+
 		if(quest.repeat != EnumQuestRepeat.NONE && quest.type == EnumQuestType.Dialog){
 			QuestDialog questdialog = (QuestDialog) quest.questInterface;
 			for(int dialog : questdialog.dialogs.values()){
 				playerdata.dialogData.dialogsRead.remove(dialog);
 			}
 		}
+		if (questData.sendAlerts) {
+			Server.sendData((EntityPlayerMP) player, EnumPacketClient.MESSAGE, "quest.completed", questData.quest.title);
+			Server.sendData((EntityPlayerMP) player, EnumPacketClient.CHAT, "quest.completed", ": ", questData.quest.title);
+		}
+
 	}
 	public static boolean canQuestBeAccepted(Quest quest, EntityPlayer player){
 		if(quest == null)