diff --git a/source/ubl-settings-usergroups-settings.c b/source/ubl-settings-usergroups-settings.c
index e6d44c2..e7d7d33 100644
--- a/source/ubl-settings-usergroups-settings.c
+++ b/source/ubl-settings-usergroups-settings.c
@@ -671,25 +671,29 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_
 
 	g_signal_connect(G_OBJECT(window->RootPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->RootPasswordButton);
 	g_signal_connect(G_OBJECT(window->DefaultPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->DefaultPasswordButton);
-	char *default_password = yon_config_get_by_key(DEFAULTPASSWD_parameter);
-	if (!yon_char_is_empty(default_password)){
-		if (!strcmp(default_password," ")){
-			gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),2);
-		} else if (!strcmp(default_password,"!*")){
-			gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),3);
+	if (!yon_config_check_default(DEFAULTPASSWD_parameter)){
+		char *default_password = yon_config_get_by_key(DEFAULTPASSWD_parameter);
+		if (!yon_char_is_empty(default_password)){
+			if (!strcmp(default_password," ")){
+				gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),2);
+			} else if (!strcmp(default_password,"!*")){
+				gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),3);
 
-		} else {
-			gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),1);
-			gtk_entry_set_text(GTK_ENTRY(window->DefaultPasswordEntry),default_password);
+			} else {
+				gtk_combo_box_set_active(GTK_COMBO_BOX(window->DefaultPasswordCombo),1);
+				gtk_entry_set_text(GTK_ENTRY(window->DefaultPasswordEntry),default_password);
+			}
 		}
 	}
+	if (!yon_config_check_default(DEFAULTROOTPASSWD_parameter)){
 	char *root_password = yon_config_get_by_key(DEFAULTROOTPASSWD_parameter);
-	if (!yon_char_is_empty(root_password)){
-		if (!strcmp(root_password," ")){
-			gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),2);
-		} else {
-			gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),1);
-			gtk_entry_set_text(GTK_ENTRY(window->RootPasswordEntry),root_password);
+		if (!yon_char_is_empty(root_password)){
+			if (!strcmp(root_password," ")){
+				gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),2);
+			} else {
+				gtk_combo_box_set_active(GTK_COMBO_BOX(window->RootPasswordCombo),1);
+				gtk_entry_set_text(GTK_ENTRY(window->RootPasswordEntry),root_password);
+			}
 		}
 	}
 	char *is_k_admin = yon_config_get_by_key(ADDADM_parameter);