diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c
index 1a9f810..2699740 100644
--- a/source/ubl-settings-usergroups.c
+++ b/source/ubl-settings-usergroups.c
@@ -751,6 +751,10 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_
 	char *default_user = yon_config_get_by_key("DEFAULTUSER");
 	if (!yon_char_is_empty(default_user))
 		gtk_entry_set_text(GTK_ENTRY(window->DefaultUserNameEntry),default_user);
+
+
+	g_signal_connect(G_OBJECT(window->RootPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->RootPasswordButton);
+	g_signal_connect(G_OBJECT(window->DefaultPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->DefaultPasswordButton);
 	char *default_password = yon_config_get_by_key("DEFAULTPASSWD");
 	if (!yon_char_is_empty(default_password)){
 		gtk_entry_set_text(GTK_ENTRY(window->DefaultPasswordEntry),default_password);
@@ -786,9 +790,7 @@ ubl_settings_usergroups_additional_settings_window *yon_ubl_settings_usergroups_
 
 	g_signal_connect(G_OBJECT(window->EncryptAllPasswordsButton),"clicked",G_CALLBACK(on_passwords_encrypt),NULL);
 
-	g_signal_connect(G_OBJECT(window->RootPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->RootPasswordButton);
 	g_signal_connect(G_OBJECT(window->PasswordHashCombo),"changed",G_CALLBACK(on_hash_changed),window);
-	g_signal_connect(G_OBJECT(window->DefaultPasswordCombo),"changed",G_CALLBACK(on_password_combo_changed),window->DefaultPasswordButton);
 
 return window;
 }
@@ -1109,11 +1111,14 @@ void on_password_changed(GtkEntry *self, ubl_settings_usergroups_password_window
 void on_password_accept(GtkWidget *self, dictionary *dict){
 	ubl_settings_usergroups_password_window *window = yon_dictionary_get_data(dict->first,ubl_settings_usergroups_password_window*);
 	GtkEntry *entry = yon_dictionary_get_data(dict->first->next,GtkEntry*);
-	char *pasted_hash = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry));
-	if (!yon_char_is_empty(pasted_hash)){
+	char *password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
+	if (yon_char_is_empty(password)){
+		char *pasted_hash = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry));
+		if (!yon_char_is_empty(pasted_hash)){
 				gtk_entry_set_text(entry,pasted_hash);
+		}
 	} else {
-		char *password = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
+		
 		if (yon_char_is_empty(password)){
 			yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"password_empty",EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
 			return;
diff --git a/ubl-settings-usergroups-additional-settings.glade b/ubl-settings-usergroups-additional-settings.glade
index c08282a..29db0df 100644
--- a/ubl-settings-usergroups-additional-settings.glade
+++ b/ubl-settings-usergroups-additional-settings.glade
@@ -164,7 +164,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
-                        <property name="max-length">30</property>
                         <property name="visibility">False</property>
                         <property name="invisible-char">*</property>
                         <property name="secondary-icon-name">com.ublinux.ubl-settings-usergroups.key-symbolic</property>
@@ -242,7 +241,6 @@
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can-focus">True</property>
-                        <property name="max-length">30</property>
                         <property name="visibility">False</property>
                         <property name="invisible-char">*</property>
                         <property name="secondary-icon-name">com.ublinux.ubl-settings-usergroups.key-symbolic</property>