diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 7ee2466..853d076 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -883,6 +883,7 @@ void on_password_change(GtkWidget *self, dictionary *entry_dict){
 			if (!check_is_password_hash(password)){
 				gtk_entry_set_text(GTK_ENTRY(window->PasswordHashEntry),password);
 			} else {
+				if (password[0]=='%'&&password[1]=='%')
 					gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->NoEncriptionCheck),1);
 				gtk_entry_set_text(GTK_ENTRY(window->PasswordEntry),password);
 			}
@@ -2370,11 +2371,15 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 				} 
 				free(parameters);
 				parameters=yon_char_parse(yon_config_get_by_key(USERSHADOW(name)),&parsed_size,":");
-				gtk_entry_set_text(GTK_ENTRY(window->userPasswordChangedEntry),parsed_size>0?parameters[0]:"");
+				if (!strcmp(parameters[0],"0"))
+					gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userForceChangeCheck),1);
+				else
+					gtk_entry_set_text(GTK_ENTRY(window->userPasswordChangedEntry),parsed_size>0?parameters[0]:"");
 				gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->userPasswordChangeDelayMinimumSpin),atol(parsed_size>1?parameters[1]:"0"));
 				gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->userPasswordChangeDelayMaximumSpin),atol(parsed_size>2?parameters[2]:"0"));
 				gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->userWarningSpin),atol(parsed_size>3?parameters[3]:"0"));
 				gtk_spin_button_set_value(GTK_SPIN_BUTTON(window->userActivitySpin),atol(parsed_size>4?parameters[4]:"0"));
+				
 				if (parsed_size>5&&!yon_char_is_empty(parameters[5])){
 					gtk_entry_set_text(GTK_ENTRY(window->userPasswordExpirationEntry),parameters[5]);
 				}