diff --git a/Map Server/Actors/Chara/Player/Player.cs b/Map Server/Actors/Chara/Player/Player.cs
index 910cfda2..b1ae6fc5 100644
--- a/Map Server/Actors/Chara/Player/Player.cs	
+++ b/Map Server/Actors/Chara/Player/Player.cs	
@@ -1436,7 +1436,7 @@ namespace Meteor.Map.Actors
 
             playerWork.questScenario[freeSlot] = instance.Id;
             questScenario[freeSlot] = instance;
-            Database.SaveQuest(this, questScenario[freeSlot]);
+            Database.SaveQuest(this, questScenario[freeSlot], freeSlot);
             SendQuestClientUpdate(freeSlot);
 
             if (!isSilent)
@@ -1458,7 +1458,7 @@ namespace Meteor.Map.Actors
                 {
                     questScenario[i] = newQuestInstance;
                     playerWork.questScenario[i] = questScenario[i].Id;
-                    Database.SaveQuest(this, questScenario[i]);
+                    Database.SaveQuest(this, questScenario[i], i);
                     SendQuestClientUpdate(i);
                     break;
                 }
@@ -1557,7 +1557,7 @@ namespace Meteor.Map.Actors
             if (activeQuest == null)
                 questStateManager.ForceAddActiveQuest(questScenario[freeSlot]);
 
-            Database.SaveQuest(this, questScenario[freeSlot]);
+            Database.SaveQuest(this, questScenario[freeSlot], freeSlot);
             SendQuestClientUpdate(freeSlot);
 
             if (!isSilent)
diff --git a/Map Server/Actors/Quest/QuestData.cs b/Map Server/Actors/Quest/QuestData.cs
index 6b0818db..4707a03a 100644
--- a/Map Server/Actors/Quest/QuestData.cs	
+++ b/Map Server/Actors/Quest/QuestData.cs	
@@ -161,7 +161,7 @@ namespace Meteor.Map.Actors.QuestNS
 
         public void Save()
         {
-            Database.SaveQuest(owner, parent);
+            Database.UpdateQuest(owner, parent);
         }
     }
 }
diff --git a/Map Server/Database.cs b/Map Server/Database.cs
index aab35607..d7d47f1f 100644
--- a/Map Server/Database.cs	
+++ b/Map Server/Database.cs	
@@ -527,18 +527,6 @@ namespace Meteor.Map
             }
         }
 
-        public static void SaveQuest(Player player, Quest quest)
-        {
-            int slot = player.GetQuestSlot(quest.Id);
-            if (slot == -1)
-            {
-                Program.Log.Error("Tried saving quest player didn't have: Player: {0:x}, QuestId: {0:x}", player.Id, quest.Id);
-                return;
-            }
-            else
-                SaveQuest(player, quest, slot);
-        }
-
         public static void SaveQuest(Player player, Quest quest, int slot)
         {
             string query;
@@ -588,6 +576,51 @@ namespace Meteor.Map
             }
         }
 
+        public static void UpdateQuest(Player player, Quest quest)
+        {
+            string query;
+            MySqlCommand cmd;
+
+            QuestData qData = quest.GetData();
+
+            using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
+            {
+                try
+                {
+                    conn.Open();
+
+                    query = @"
+                    UPDATE characters_quest_scenario 
+                    SET sequence = @sequence, flags = @flags, counter1 = @counter1, counter2 = @counter2, counter3 = @counter3
+                    WHERE characterId = @charaId and questId = @questId
+                    ";
+
+                    cmd = new MySqlCommand(query, conn);
+                    cmd.Parameters.AddWithValue("@charaId", player.Id);
+                    cmd.Parameters.AddWithValue("@questId", 0xFFFFF & quest.Id);
+                    cmd.Parameters.AddWithValue("@sequence", quest.GetSequence());
+
+                    if (qData != null)
+                    {
+                        cmd.Parameters.AddWithValue("@flags", qData.GetFlags());
+                        cmd.Parameters.AddWithValue("@counter1", qData.GetCounter(1));
+                        cmd.Parameters.AddWithValue("@counter2", qData.GetCounter(2));
+                        cmd.Parameters.AddWithValue("@counter3", qData.GetCounter(3));
+                    }
+
+                    cmd.ExecuteNonQuery();
+                }
+                catch (MySqlException e)
+                {
+                    Program.Log.Error(e.ToString());
+                }
+                finally
+                {
+                    conn.Dispose();
+                }
+            }
+        }
+
         public static void MarkGuildleve(Player player, uint glId, bool isAbandoned, bool isCompleted)
         {
             string query;