diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c
index 39a76b1..23de598 100644
--- a/source/ubl-settings-system.c
+++ b/source/ubl-settings-system.c
@@ -373,18 +373,14 @@ void on_console_font_changed(GtkComboBox *self, main_window *widgets){
 
 void on_language_changed(GtkComboBox *self, main_window *widgets){
     GtkTreeIter iter;
-    if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LanguageCombo))==0){
-        yon_config_remove_by_key(language_parameter);
+    gtk_combo_box_get_active_iter(self,&iter);
+    char *code;
+    gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1);
+    if (code)
+    if (yon_config_get_by_key(language_parameter)){
+        yon_config_set(language_parameter,code);
     } else {
-        gtk_combo_box_get_active_iter(self,&iter);
-        char *code;
-        gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1);
-        if (code)
-        if (yon_config_get_by_key(language_parameter)){
-            yon_config_set(language_parameter,code);
-        } else {
-            yon_config_register(language_parameter,"locale",code);
-        }
+        yon_config_register(language_parameter,"locale",code);
     }
 }