diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 128bdd58b5..3c67309495 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -1787,7 +1787,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
       "Prevents your system's screensaver from becoming active.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
-      "Sets the window size relative to the core viewport size. Alternatively you can set a window width and height below for a fixed window size")
+      "Sets the window size relative to the core viewport size. Alternatively you can set a window width and height below for a fixed window size.")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_LANGUAGE,
       "Sets the language of the interface.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
@@ -2399,3 +2399,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SMOOTH,
       "Add a slight blur to the image to take the edge off of the hard pixel edges. This option has very little impact on performance.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FILTER,
       "Apply a CPU-powered video filter. NOTE: Might come at a high performance cost. Some video filters might only work for cores that use 32bit or 16bit color.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME,
+      "Input the username of your Retro Achievements account.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD,
+      "Input the password of your Retro Achievements account.")
+MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_NICKNAME,
+      "Input your user name here. This will be used for netplay sessions among other things.")
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 10bbfee67d..11dc542f25 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -125,6 +125,9 @@ default_sublabel_macro(action_bind_sublabel_menu_input_unified_controls,   MENU_
 default_sublabel_macro(action_bind_sublabel_onscreen_notifications_enable, MENU_ENUM_SUBLABEL_VIDEO_FONT_ENABLE)
 default_sublabel_macro(action_bind_sublabel_video_crop_overscan,           MENU_ENUM_SUBLABEL_VIDEO_CROP_OVERSCAN)
 default_sublabel_macro(action_bind_sublabel_video_filter,                  MENU_ENUM_SUBLABEL_VIDEO_FILTER)
+default_sublabel_macro(action_bind_sublabel_netplay_nickname,              MENU_ENUM_SUBLABEL_NETPLAY_NICKNAME)
+default_sublabel_macro(action_bind_sublabel_cheevos_username,              MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME)
+default_sublabel_macro(action_bind_sublabel_cheevos_password,              MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD)
 
 /* MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM*/
 
@@ -188,6 +191,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
    {
       switch (cbs->enum_idx)
       {
+         case MENU_ENUM_LABEL_NETPLAY_NICKNAME:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_netplay_nickname);
+            break;
+         case MENU_ENUM_LABEL_CHEEVOS_USERNAME:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cheevos_username);
+            break;
+         case MENU_ENUM_LABEL_CHEEVOS_PASSWORD:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cheevos_password);
+            break;
          case MENU_ENUM_LABEL_VIDEO_FILTER:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_filter);
             break;
diff --git a/msg_hash.h b/msg_hash.h
index 54281804e6..721d886feb 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -759,8 +759,8 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
 
-   MENU_ENUM_LABEL_CHEEVOS_USERNAME,
-   MENU_ENUM_LABEL_CHEEVOS_PASSWORD,
+   MENU_LABEL(CHEEVOS_USERNAME),
+   MENU_LABEL(CHEEVOS_PASSWORD),
 
    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS,
    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD,