diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 308958e..ed9825c 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -223,13 +223,17 @@ if (main_config.sync_users){
 }
 
 void yon_accept_changes(){
-	char *remove_homes = "";
-	for (int i=0;i<main_config.homes_size;i++){
-		remove_homes = yon_char_unite(remove_homes,yon_char_is_empty(remove_homes)?"":",",main_config.remove_homes[i],NULL);
-	}
-	if (!yon_char_is_empty(remove_homes)){
-		if (system(remove_home_dirs_command(remove_homes))){};
+	if (main_config.homes_size&&main_config.remove_homes){
+		char *remove_homes = "";
+		for (int i=0;i<main_config.homes_size;i++){
+			remove_homes = yon_char_unite(remove_homes,yon_char_is_empty(remove_homes)?"":",",main_config.remove_homes[i],NULL);
+		}
+		if (!yon_char_is_empty(remove_homes)){
+			if (system(remove_home_dirs_command(remove_homes))){};
+		}
 	}
+	main_config.remove_homes=NULL;
+	main_config.homes_size=0;
 }
 
 void yon_hide_passwords(template_saving_window *window){