diff --git a/command.c b/command.c
index 0b57fd2d75..31b747e3fb 100644
--- a/command.c
+++ b/command.c
@@ -1209,7 +1209,8 @@ static void command_event_load_auto_state(void)
    global_t   *global   = global_get_ptr();
 
 #ifdef HAVE_NETWORKING
-   if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) && !settings->netplay.is_spectate)
+   if (     netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) 
+         && !settings->netplay.is_spectate)
       return;
 #endif
 
@@ -1232,7 +1233,8 @@ static void command_event_load_auto_state(void)
 
    RARCH_LOG("Found auto savestate in: %s\n", savestate_name_auto);
 
-   snprintf(msg, sizeof(msg), "Auto-loading savestate from \"%s\" %s.",
+   snprintf(msg, sizeof(msg), "%s \"%s\" %s.",
+         msg_hash_to_str(MSG_AUTOLOADING_SAVESTATE_FROM),
          savestate_name_auto, ret ? "succeeded" : "failed");
    RARCH_LOG("%s\n", msg);
 }
@@ -1575,7 +1577,7 @@ static void command_event_save_current_config(int override_type)
    {
       if (config_save_overrides(override_type))
       {
-         snprintf(msg, sizeof(msg), "Overrides saved successfully");
+         strlcpy(msg, msg_hash_to_str(MSG_OVERRIDES_SAVED_SUCCESSFULLY), sizeof(msg));
          RARCH_LOG("[overrides] %s\n", msg);
 
          /* set overrides to active so the original config can be
@@ -1584,7 +1586,7 @@ static void command_event_save_current_config(int override_type)
       }
       else
       {
-         snprintf(msg, sizeof(msg), "Error saving overrides");
+         strlcpy(msg, msg_hash_to_str(MSG_OVERRIDES_ERROR_SAVING), sizeof(msg));
          RARCH_ERR("[overrides] %s\n", msg);
       }
    }
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index df0dc25876..b095873d3d 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -3113,10 +3113,16 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Loading";
       case MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT:
          return "Per-Game Options: game-specific core options found at";
+      case MSG_AUTOLOADING_SAVESTATE_FROM:
+         return "Auto-loading savestate from";
       case MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT:
          return "Network Remote Base Port";
+      case MSG_OVERRIDES_SAVED_SUCCESSFULLY:
+         return "Overrides saved successfully.";
       case MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY:
          return "Autoconfig file saved successfully.";
+      case MSG_OVERRIDES_ERROR_SAVING:
+         return "Error saving overrides.";
       case MSG_AUTOCONFIG_FILE_ERROR_SAVING:
          return "Error saving autoconf file.";
       case MSG_DOWNLOAD_FAILED:
diff --git a/msg_hash.h b/msg_hash.h
index 764380c537..cc5fd377d6 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -198,8 +198,11 @@ enum msg_hash_enums
    MSG_LOADING_HISTORY_FILE,
    MSG_COULD_NOT_READ_STATE_FROM_MOVIE,
    MSG_MOVIE_FILE_IS_NOT_A_VALID_BSV1_FILE,
+   MSG_OVERRIDES_SAVED_SUCCESSFULLY,
    MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY,
    MSG_AUTOCONFIG_FILE_ERROR_SAVING,
+   MSG_OVERRIDES_ERROR_SAVING,
+   MSG_AUTOLOADING_SAVESTATE_FROM,
    MSG_SRAM_WILL_NOT_BE_SAVED,
    MSG_RECEIVED,
    MSG_LOADING_CONTENT_FILE,