diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index c09b947..9e3ad8d 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1061,7 +1061,11 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window
 			yon_config_append(USERADD_SYNC_parameter,"boot",",");
 		}
 	} else {
-		yon_config_remove_element(USERADD_SYNC_parameter,"boot",",");
+		if (!strcmp(config(USERADD_SYNC_parameter),"boot")){
+			yon_config_remove_by_key(USERADD_SYNC_parameter);	
+		} else {
+			yon_config_remove_element(USERADD_SYNC_parameter,"boot",",");
+		}
 	}
  }
 
@@ -1074,7 +1078,11 @@ void on_expiration_clicked(GtkWidget *self, ubl_settings_usergroups_user_window
 			yon_config_append(USERADD_SYNC_parameter,"shutdown",",");
 		}
 	} else {
-		yon_config_remove_element(USERADD_SYNC_parameter,"shutdown",",");
+		if (!strcmp(config(USERADD_SYNC_parameter),"shutdown")){
+			yon_config_remove_by_key(USERADD_SYNC_parameter);	
+		} else {
+			yon_config_remove_element(USERADD_SYNC_parameter,"shutdown",",");
+		}
 	}
  }