diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 5409f12..2170701 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -280,10 +280,32 @@ void on_config_global_save(){
 }
 
 void on_config_local_save(){
+	int size;
+	config_str keys = yon_config_get_all_by_key("USERADD[",&size);
+	int passw_size;
+	config_str passwords = NULL;
+	for (int i=0;i<size;i++){
+		int parsed_size;
+		char *key,*value;
+		yon_config_parse_parameter(keys[i],&key,&value);
+		config_str parsed = yon_char_parse(value,&parsed_size,":");
+		if (parsed_size>5&&!yon_char_is_empty(parsed[5])){
+			yon_char_parsed_add_or_create_if_exists(passwords,&passw_size,yon_char_new(parsed[5]));
+			parsed = yon_char_parsed_rip(parsed,&parsed_size,5);
+			yon_config_set(key,yon_char_parsed_to_string(parsed,parsed_size,":"));
+		}
+		free(key);
+		free(value);
+	}
 	yon_accept_changes();
 	yon_samba_sync_proceed();
 	template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,"users", "DEFAULTPASSWD DEFAULTROOTPASSWD DEFAULTUSER HASHPASSWD USERGROUPS ADDADM USERADD[*] USERSHADOW[*] GROUPADD[*]",NULL);
 	if (window) yon_hide_passwords(window);
+	for (int i=0;i<size;i++){
+		char *key,*value;
+		yon_config_parse_parameter(keys[i],&key,&value);
+		yon_config_set(key,value);
+	}
 }
 
 void on_saving_settings_save(GtkWidget *self, yon_savasettings_window *window){