diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 9d6645b..ac3537a 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1890,7 +1890,7 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 	char *old_password = NULL;
 	if (window->old_password){
 		old_password = window->old_password;
-		if (old_password[0]=='!') free(yon_char_divide(old_password,0));
+		if (old_password[0]=='!'||old_password[0]=='*') free(yon_char_divide(old_password,0));
 	}
 	if (!old_password||old_password&&strcmp(old_password,password)){
 		time_t t = time(NULL);
@@ -2497,8 +2497,9 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 				if (!yon_char_is_empty(window->old_password)&&strlen(window->old_password)&&window->old_password[0]=='!'&&window->old_password[1]=='*'){
 					free(yon_char_divide(window->old_password,1));
 				}
+				if (!strcmp(parameters[5],"!*")) parameters[5][1]='\0';
 					if (strcmp(parameters[5],"x")&&strcmp(parameters[5],"")){
-						if (parameters[5][0]=='!'){
+						if (parameters[5][0]=='!'||parameters[5][0]=='*'){
 							gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userDeactivatedCheck),1);
 						}
 						free(yon_char_divide(parameters[5],0));