diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index eb6369228f..ec45b37c85 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2306,14 +2306,8 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
          break;
       case DISPLAYLIST_ACCOUNTS_CHEEVOS_LIST:
 #ifdef HAVE_CHEEVOS
-         menu_entries_push(info->list,
-               menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME),
-               menu_hash_to_str(MENU_LABEL_ACCOUNTS_CHEEVOS_USERNAME),
-               0, 0, 0);
-         menu_entries_push(info->list,
-               menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD),
-               menu_hash_to_str(MENU_LABEL_ACCOUNTS_CHEEVOS_PASSWORD),
-               0, 0, 0);
+         ret = menu_displaylist_parse_settings(menu, info, SL_FLAG_SETTINGS_GROUP_ALL,
+               "Accounts", PARSE_NONE);
 #else
          menu_entries_push(info->list,
                menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index d3e2b76ba1..8c6ccb7f27 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -5956,7 +5956,7 @@ static bool setting_append_list_accounts_options(
    settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
 
    CONFIG_STRING(
-         settings->cheevos.username,
+         settings->cheevos.password,
 #if 0
          menu_hash_to_str(MENU_LABEL_CHEEVOS_USERNAME),
          menu_hash_to_str(MENU_LABEL_VALUE_CHEEVOS_USERNAME),
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index c980bc190e..72fa06f546 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -90,8 +90,8 @@ enum setting_list_flags
    SL_FLAG_SETTINGS_FRAME_THROTTLE_OPTIONS          =  (1 << 26),
    SL_FLAG_SETTINGS_LOGGING_OPTIONS                 =  (1 << 27),
    SL_FLAG_SETTINGS_SAVING_OPTIONS                  =  (1 << 28),
-   SL_FLAG_SETTINGS_ALL                             =  (1 << 29),
-   SL_FLAG_SETTINGS_SUB_ACCOUNTS_OPTIONS            =  (1 << 30),
+   SL_FLAG_SETTINGS_SUB_ACCOUNTS_OPTIONS            =  (1 << 29),
+   SL_FLAG_SETTINGS_ALL                             =  (1 << 30),
    SL_FLAG_ALLOW_EMPTY_LIST                         =  (1 << 31)
 };