diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 5b0605c..9c85d64 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -1003,7 +1003,8 @@ void on_group_save(GtkWidget *self, dictionary *dict){
 	GtkTreeModel *model = GTK_TREE_MODEL(widgets->GroupsList);
 	if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree)),&model,&iter))
 		gtk_list_store_append(widgets->GroupsList,&iter);
-	gtk_list_store_set(widgets->GroupsList,&iter,0,strcmp(gid,"x")?gid:AUTOMATICALLY_LABEL,1,group_name,2,group_users,3,yon_char_append(non_unique,gsystem),4,gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->PasswordCombo)),-1);
+		char *passwor =  (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
+	gtk_list_store_set(widgets->GroupsList,&iter,0,strcmp(gid,"x")?gid:"",1,group_name,2,group_users,3,yon_char_append(non_unique,gsystem),4,gtk_combo_box_get_active(GTK_COMBO_BOX(window->PasswordCombo))==0?DEFAULT_USER_LABEL:check_is_password_hash(passwor)?UNENCRYPTED_LABEL:ENCRYPTED_LABEL,-1);
 	on_subwindow_close(self);
 }
 
@@ -2212,7 +2213,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 						gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),parsed[4]);
 						gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),2);
 					} else {
-						gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),1);
+						gtk_combo_box_set_active(GTK_COMBO_BOX(window->PasswordCombo),0);
 					}
 				}
 				char *sync = yon_config_get_by_key(GROUPADD_SYNC(name));