diff --git a/aegisub/src/ass_file.cpp b/aegisub/src/ass_file.cpp
index b58a2cdd3..266e6a636 100644
--- a/aegisub/src/ass_file.cpp
+++ b/aegisub/src/ass_file.cpp
@@ -164,10 +164,9 @@ wxString AssFile::AutoSave() {
 		wxMkdir(path);
 
 	wxString name = origfile.GetName();
-	if (name.empty())
-		dstpath.SetFullName("Untitled.AUTOSAVE.ass");
-	else
-		dstpath.SetFullName(name + ".AUTOSAVE.ass");
+	if (!name)
+		name = "Untitled";
+	dstpath.SetFullName(wxString::Format("%s.%s.AUTOSAVE.ass", name, wxDateTime::Now().Format("%Y-%m-%d-%H-%M-%S")));
 
 	Save(dstpath.GetFullPath(), false, false);
 
diff --git a/aegisub/src/main.cpp b/aegisub/src/main.cpp
index 5ac03bb9a..445b319d1 100644
--- a/aegisub/src/main.cpp
+++ b/aegisub/src/main.cpp
@@ -282,15 +282,14 @@ bool AegisubApp::OnInit() {
 	}
 #endif
 
+	StartupLog("Clean old autosave files");
+	wxString autosave_path = lagi_wxString(OPT_GET("Path/Auto/Save")->GetString());
+	CleanCache(autosave_path, "*.AUTOSAVE.ass", 100, 1000);
+
 	StartupLog("Initialization complete");
 	return true;
 }
 
-
-
-/// @brief Exit
-/// @return
-///
 int AegisubApp::OnExit() {
 	if (frame)
 		delete frame;