diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 777f800130..91ed293158 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -11045,6 +11045,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,
@@ -11083,6 +11084,7 @@ static bool setting_append_list(
          (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
          (*list)[list_info->index - 1].get_string_representation =
             &setting_get_string_representation_uint_user_language;
+         (*list)[list_info->index - 1].ui_type       = ST_UI_TYPE_UINT_COMBOBOX;
 #endif
 
          END_SUB_GROUP(list, list_info, parent_group);
@@ -11148,6 +11150,7 @@ static bool setting_append_list(
                update_streaming_url_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;
 
          END_SUB_GROUP(list, list_info, parent_group);
          END_GROUP(list, list_info, parent_group);
@@ -11174,6 +11177,7 @@ static bool setting_append_list(
                update_streaming_url_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;
 
          END_SUB_GROUP(list, list_info, parent_group);
          END_GROUP(list, list_info, parent_group);
diff --git a/ui/drivers/qt/options/user.cpp b/ui/drivers/qt/options/user.cpp
index a004785702..4178d4deda 100644
--- a/ui/drivers/qt/options/user.cpp
+++ b/ui/drivers/qt/options/user.cpp
@@ -24,12 +24,11 @@ UserPage::UserPage(QObject *parent) :
 
 QWidget *UserPage::widget()
 {
-   QWidget *widget = new QWidget;
-
+   QWidget *widget    = new QWidget;
    FormLayout *layout = new FormLayout;
 
-   layout->addStringLineEdit(MENU_ENUM_LABEL_NETPLAY_NICKNAME);
-   layout->addUIntComboBox(MENU_ENUM_LABEL_USER_LANGUAGE);
+   layout->add(MENU_ENUM_LABEL_NETPLAY_NICKNAME);
+   layout->add(MENU_ENUM_LABEL_USER_LANGUAGE);
 
    widget->setLayout(layout);
 
@@ -44,27 +43,24 @@ AccountsPage::AccountsPage(QObject *parent) :
 
 QWidget *AccountsPage::widget()
 {
-   QWidget *widget = new QWidget;
-
-   QVBoxLayout *layout = new QVBoxLayout;
-
+   QWidget *widget             = new QWidget;
+   QVBoxLayout *layout         = new QVBoxLayout;
    SettingsGroup *youtubeGroup = new SettingsGroup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE));
-   SettingsGroup *twitchGroup = new SettingsGroup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH));
-
+   SettingsGroup *twitchGroup  = new SettingsGroup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH));
 #ifdef HAVE_CHEEVOS
    SettingsGroup *cheevosGroup = new SettingsGroup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS));
 
-   cheevosGroup->addStringLineEdit(MENU_ENUM_LABEL_CHEEVOS_USERNAME);
-   cheevosGroup->addPasswordLineEdit(MENU_ENUM_LABEL_CHEEVOS_PASSWORD);
+   cheevosGroup->add(MENU_ENUM_LABEL_CHEEVOS_USERNAME);
+   cheevosGroup->add(MENU_ENUM_LABEL_CHEEVOS_PASSWORD);
 
    layout->addWidget(cheevosGroup);
 #endif
 
-   youtubeGroup->addStringLineEdit(MENU_ENUM_LABEL_YOUTUBE_STREAM_KEY);
+   youtubeGroup->add(MENU_ENUM_LABEL_YOUTUBE_STREAM_KEY);
 
    layout->addWidget(youtubeGroup);
 
-   twitchGroup->addStringLineEdit(MENU_ENUM_LABEL_TWITCH_STREAM_KEY);
+   twitchGroup->add(MENU_ENUM_LABEL_TWITCH_STREAM_KEY);
 
    layout->addWidget(twitchGroup);