diff --git a/source/ubl-settings-usergroups-user.c b/source/ubl-settings-usergroups-user.c
index 9e95b00..f6e63d2 100644
--- a/source/ubl-settings-usergroups-user.c
+++ b/source/ubl-settings-usergroups-user.c
@@ -408,12 +408,6 @@ void on_user_save(GtkWidget *self, dictionary *dict){
 			password = "!*";
 	} else if (password_active ==4){
 		password = (char*)gtk_entry_get_text(GTK_ENTRY(window->userPasswordEntry));
-		if (yon_char_is_empty(password)){
-				yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-				yon_ubl_status_highlight_incorrect(window->userPasswordEntry);
-					gtk_notebook_set_current_page(GTK_NOTEBOOK(window->MainNotebook),0);
-				return;
-		}
 		if (password[0]!='!') {
 			char *temp = yon_char_append("!",password);
 			password=temp;
diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 77e7fb2..2327c2a 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -648,35 +648,8 @@ char *yon_user_check_groups(GtkListStore *list, char *target){
 }
 
 void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){
-	// GtkTreeIter iter,itar;
 	main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
 	yon_confirmation_window *window = yon_dictionary_get_data(dict->first->next,yon_confirmation_window*);
-	// int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->UsersList),&iter);
-	// for (;valid;valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->UsersList),&iter)){
-	// 	char *name;
-	// 	gtk_tree_model_get(GTK_TREE_MODEL(widgets->UsersList),&iter,2,&name,-1);
-	// 	int valid2 = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->list),&itar);
-	// 	for (;valid2;valid2 = gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&itar)){
-	// 		char *name_check;
-	// 		int status,delete;
-	// 		gtk_tree_model_get(GTK_TREE_MODEL(window->list),&itar,0,&delete,1,&name_check,3,&status,-1);
-	// 		if (!strcmp(name,name_check)&&delete){
-	// 			gtk_list_store_remove(widgets->UsersList,&iter);
-	// 			yon_config_remove_by_key(USERADD(name));
-	// 			yon_config_remove_by_key(USERSHADOW(name));
-	// 			yon_config_register(USERADD_SYNC(name),USERADD_SYNC_command(name),"");
-	// 			yon_config_remove_by_key(USERADD_SYNC(name));
-	// 			yon_config_remove_by_key(USERSHADOW_SYNC(name));
-	// 			gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->UsersList),&iter);
-	// 			if (status){
-	// 				if (yon_char_parsed_check_exist(main_config.remove_homes,main_config.homes_size,name)==-1){
-	// 					yon_char_parsed_add_or_create_if_exists(main_config.remove_homes,&main_config.homes_size,name);
-	// 				}
-	// 			}
-	// 		}
-	// 	}
-	// }
-
 	GtkTreeIter iter;
 	GtkTreeModel *model = GTK_TREE_MODEL(window->list);
 	char *single_target = NULL;
@@ -725,27 +698,6 @@ void yon_delete_confirmation_save(GtkWidget *self, dictionary *dict){
 
 	yon_interface_update(widgets);
 	
-		// char *name;
-		// if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->UsersList),&iter)){
-		// 	gtk_tree_model_get(GTK_TREE_MODEL(widgets->UsersList),&iter,2,&name,-1);
-		// 	int valid2 = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->list),&itar);
-		// 	for (;valid2;valid2 = gtk_tree_model_iter_next(GTK_TREE_MODEL(window->list),&itar)){
-		// 		char *name_check;
-		// 		int status,delete;
-		// 		gtk_tree_model_get(GTK_TREE_MODEL(window->list),&itar,0,&delete,1,&name_check,3,&status,-1);
-		// 		if (!strcmp(name,name_check)&&delete){
-		// 			gtk_list_store_remove(widgets->UsersList,&iter);
-		// 			yon_config_remove_by_key(USERADD(name));
-		// 			yon_config_remove_by_key(USERSHADOW(name));
-		// 			gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->UsersList),&iter);
-		// 			if (status){
-		// 				if (yon_char_parsed_check_exist(main_config.remove_homes,main_config.homes_size,name)==-1){
-		// 					yon_char_parsed_add_or_create_if_exists(main_config.remove_homes,&main_config.homes_size,name);
-		// 				}
-		// 			}
-		// 		}
-		// 	}
-		// }
 	on_subwindow_close(self);
 }
 
@@ -1618,11 +1570,11 @@ void on_main_edit(GtkWidget *, main_window *widgets){
 					}
 				}
 				if (parsed_size>5){
-					if (check_is_password_hash(parameters[5])){
-						if (strcmp(parameters[5],"!*")&&!yon_char_check_begins_with(parameters[5],"%%")){
-							char *temp = yon_char_append("%%",parameters[5]);
-							free(parameters[5]);
-							parameters[5]=temp;
+					if (strcmp(parameters[5]," ")&&!yon_char_check_begins_with(parameters[5],"!")&&!yon_char_check_begins_with(parameters[5],"*")&&!yon_char_check_begins_with(parameters[5],"%%")){
+						if (check_is_password_hash(parameters[5])){
+								char *temp = yon_char_append("%%",parameters[5]);
+								free(parameters[5]);
+								parameters[5]=temp;
 						}
 					}
 					window->old_password=yon_char_new(parameters[5]);
@@ -1642,8 +1594,11 @@ void on_main_edit(GtkWidget *, main_window *widgets){
 							} else if (!strcmp(parameters[5]," ")) {
 								gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),1);
 							} else if (parameters[5][0]=='!'){
-								gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry),parameters[5]);
+								char *password_or = yon_char_new(parameters[5]);
+								free(yon_char_divide(password_or,0));
+								gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry),password_or);
 								gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),4);
+								free(password_or);
 							} else {
 								gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry),parameters[5]);
 								gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),2);