diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index d194eff6ac..12c431dac8 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -1207,11 +1207,22 @@ void rcheevos_populate_menu(void* data)
 
    if (i == 0)
    {
-      menu_entries_append_enum(info->list,
+      if (!settings->arrays.cheevos_token[0])
+      {
+         menu_entries_append_enum(info->list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_LOGGED_IN),
+            msg_hash_to_str(MENU_ENUM_LABEL_NOT_LOGGED_IN),
+            MENU_ENUM_LABEL_NOT_LOGGED_IN,
+            FILE_TYPE_NONE, 0, 0);
+      }
+      else
+      {
+         menu_entries_append_enum(info->list,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY),
             msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY),
             MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY,
             FILE_TYPE_NONE, 0, 0);
+      }
    }
 #endif
 }
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 9688adddbc..eda846e4f2 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -6810,7 +6810,7 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY,
-   "No Achievements to Display"
+   "No achievements to display"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE,
@@ -6828,6 +6828,10 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME,
    "Resume achievements for current session. (This action will disable save states, cheats, rewind, pause, and slow-motion and reset the current game)"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_NOT_LOGGED_IN,
+   "Not logged in"
+)
 
 /* Quick Menu > Information */
 
diff --git a/msg_hash.h b/msg_hash.h
index 8e6aaf9547..cc73bdc535 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1258,6 +1258,7 @@ enum msg_hash_enums
    MENU_LABEL(RESET_CORE_ASSOCIATION),
    MENU_LABEL(MENU_THROTTLE_FRAMERATE),
    MENU_LABEL(NO_ACHIEVEMENTS_TO_DISPLAY),
+   MENU_LABEL(NOT_LOGGED_IN),
    MENU_LABEL(NO_ENTRIES_TO_DISPLAY),
    MENU_LABEL(DOWNLOAD_PL_ENTRY_THUMBNAILS),