diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 944173d69c..56e1e01dd5 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -11173,6 +11173,7 @@ static bool setting_append_list(
                general_write_handler,
                general_read_handler);
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
+         (*list)[list_info->index - 1].ui_type       = ST_UI_TYPE_STRING_LINE_EDIT;
 
          CONFIG_STRING(
                list, list_info,
@@ -11189,6 +11190,7 @@ static bool setting_append_list(
          (*list)[list_info->index - 1].get_string_representation =
             &setting_get_string_representation_cheevos_password;
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
+         (*list)[list_info->index - 1].ui_type       = ST_UI_TYPE_PASSWORD_LINE_EDIT;
 #endif
 
          END_SUB_GROUP(list, list_info, parent_group);
diff --git a/ui/drivers/qt/options/achievements.cpp b/ui/drivers/qt/options/achievements.cpp
index 76d0acf81f..0b7dce7651 100644
--- a/ui/drivers/qt/options/achievements.cpp
+++ b/ui/drivers/qt/options/achievements.cpp
@@ -23,20 +23,18 @@ AchievementsPage::AchievementsPage(QObject *parent) :
 
 QWidget *AchievementsPage::widget()
 {
-   QWidget *widget = new QWidget;
-
-   QVBoxLayout *layout = new QVBoxLayout;
-
+   QWidget               *widget = new QWidget;
+   QVBoxLayout           *layout = new QVBoxLayout;
    CheckableSettingsGroup *group = new CheckableSettingsGroup(MENU_ENUM_LABEL_CHEEVOS_ENABLE);
 
-   group->addStringLineEdit(MENU_ENUM_LABEL_CHEEVOS_USERNAME);
-   group->addPasswordLineEdit(MENU_ENUM_LABEL_CHEEVOS_PASSWORD);
-   group->addCheckBox(MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE);
-   group->addCheckBox(MENU_ENUM_LABEL_CHEEVOS_LEADERBOARDS_ENABLE);
-   group->addCheckBox(MENU_ENUM_LABEL_CHEEVOS_BADGES_ENABLE);
-   group->addCheckBox(MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL);
-   group->addCheckBox(MENU_ENUM_LABEL_CHEEVOS_VERBOSE_ENABLE);
-   group->addCheckBox(MENU_ENUM_LABEL_CHEEVOS_AUTO_SCREENSHOT);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_USERNAME);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_PASSWORD);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_LEADERBOARDS_ENABLE);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_BADGES_ENABLE);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_VERBOSE_ENABLE);
+   group->add(MENU_ENUM_LABEL_CHEEVOS_AUTO_SCREENSHOT);
 
    layout->addWidget(group);