diff --git a/game/scripts/gui/preferences.rpy b/game/scripts/gui/preferences.rpy
index f1d4ec2d..0524024c 100644
--- a/game/scripts/gui/preferences.rpy
+++ b/game/scripts/gui/preferences.rpy
@@ -63,6 +63,7 @@ screen preferences_general():
                 textbutton _("Tooltips") action settings.Toggle("tooltip")
                 textbutton _("System Cursor") action Preference("system cursor", "toggle")
                 textbutton _("Automatic Updates") action settings.Toggle("updates")
+                textbutton _("Autosave") action ToggleField(store, "_autosave")
 
         default trans = config.intra_transition
 
diff --git a/game/scripts/interface/achievements.rpy b/game/scripts/interface/achievements.rpy
index 0aafce72..b90b29c7 100644
--- a/game/scripts/interface/achievements.rpy
+++ b/game/scripts/interface/achievements.rpy
@@ -83,6 +83,9 @@ init python:
             return self.achievements.get(id)[3]
 
         def unlock(self, id, silent=False):
+            if _in_replay:
+                return
+
             if persistent.achievements[id][3] == False:
                 self.achievements[id][3] = True
                 persistent.achievements[id][3] = True