3 files changed, 38 insertions, 3 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 2f2d8c4c5..bf469ee73 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -105,6 +105,8 @@ void Config::ReadValues() {
 
     qt_config->beginGroup("System");
     Settings::values.use_docked_mode = qt_config->value("use_docked_mode", false).toBool();
+    Settings::values.username = qt_config->value("username", "yuzu").toString().toStdString();
+    Settings::values.language_index = qt_config->value("language_index", 1).toInt();
     qt_config->endGroup();
 
     qt_config->beginGroup("Miscellaneous");
@@ -215,6 +217,8 @@ void Config::SaveValues() {
 
     qt_config->beginGroup("System");
     qt_config->setValue("use_docked_mode", Settings::values.use_docked_mode);
+    qt_config->setValue("username", QString::fromStdString(Settings::values.username));
+    qt_config->setValue("language_index", Settings::values.language_index);
     qt_config->endGroup();
 
     qt_config->beginGroup("Miscellaneous");
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index d09505a0f..9be2c939c 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -4,9 +4,10 @@
 
 #include <QMessageBox>
 #include "core/core.h"
+#include "core/settings.h"
 #include "ui_configure_system.h"
 #include "yuzu/configuration/configure_system.h"
-#include "yuzu/ui_settings.h"
+#include "yuzu/main.h"
 
 static const std::array<int, 12> days_in_month = {{
     31,
@@ -38,6 +39,8 @@ ConfigureSystem::~ConfigureSystem() {}
 
 void ConfigureSystem::setConfiguration() {
     enabled = !Core::System::GetInstance().IsPoweredOn();
+    ui->edit_username->setText(QString::fromStdString(Settings::values.username));
+    ui->combo_language->setCurrentIndex(Settings::values.language_index);
 }
 
 void ConfigureSystem::ReadSystemSettings() {}
@@ -45,6 +48,9 @@ void ConfigureSystem::ReadSystemSettings() {}
 void ConfigureSystem::applyConfiguration() {
     if (!enabled)
         return;
+    Settings::values.username = ui->edit_username->text().toStdString();
+    Settings::values.language_index = ui->combo_language->currentIndex();
+    Settings::Apply();
 }
 
 void ConfigureSystem::updateBirthdayComboBox(int birthmonth_index) {
diff --git a/src/yuzu/configuration/configure_system.ui b/src/yuzu/configuration/configure_system.ui
index 8caf49623..f3f8db038 100644
--- a/src/yuzu/configuration/configure_system.ui
+++ b/src/yuzu/configuration/configure_system.ui
@@ -38,7 +38,7 @@
            </sizepolicy>
           </property>
           <property name="maxLength">
-           <number>10</number>
+           <number>32</number>
           </property>
          </widget>
         </item>
@@ -164,7 +164,7 @@
           </item>
           <item>
            <property name="text">
-            <string>Simplified Chinese (简体中文)</string>
+            <string>Chinese</string>
            </property>
           </item>
           <item>
@@ -187,6 +187,31 @@
             <string>Russian (Русский)</string>
            </property>
           </item>
+           <item>
+             <property name="text">
+               <string>Taiwanese</string>
+             </property>
+           </item>
+           <item>
+             <property name="text">
+               <string>British English</string>
+             </property>
+           </item>
+           <item>
+             <property name="text">
+               <string>Canadian French</string>
+             </property>
+           </item>
+           <item>
+             <property name="text">
+               <string>Latin American Spanish</string>
+             </property>
+           </item>
+           <item>
+             <property name="text">
+               <string>Simplified Chinese</string>
+             </property>
+           </item>
           <item>
            <property name="text">
             <string>Traditional Chinese (正體中文)</string>