Index: src/lang/english.txt
===================================================================
--- src/lang/english.txt	(revision 14790)
+++ src/lang/english.txt	(working copy)
@@ -2012,6 +2012,7 @@
 STR_4002_SAVE                                                   :{BLACK}Save
 STR_4003_DELETE                                                 :{BLACK}Delete
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
+STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spectator, {DATE_LONG}
 STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabyte{P "" s} free
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Unable to read drive
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Game Save Failed{}{STRING}
Index: src/saveload.cpp
===================================================================
--- src/saveload.cpp	(revision 14790)
+++ src/saveload.cpp	(working copy)
@@ -1827,11 +1827,17 @@
 void GenerateDefaultSaveName(char *buf, const char *last)
 {
 	/* Check if we are not a spectator who wants to generate a name..
-	 * Let's use the name of company #0 for now. */
-	SetDParam(0, IsValidCompanyID(_local_company) ? _local_company : COMPANY_FIRST);
-	SetDParam(1, _date);
-	GetString(buf, STR_4004, last);
-	SanitizeFilename(buf);
+	 * If so, use special spectator save name */
+	if (!IsValidCompanyID(_local_company)) {
+		SetDParam(0, _date);
+		GetString(buf, STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME, last);
+		SanitizeFilename(buf);
+	} else {
+		SetDParam(0, _local_company);
+		SetDParam(1, _date);
+		GetString(buf, STR_4004, last);
+		SanitizeFilename(buf);
+	}
 }
 
 #if 0